Skip to content

Fix two thinkos in pcie-brcmstb and nvme pci drivers #7407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
P33M merged 2 commits into from
May 29, 2026
+7 −3
Merged

Fix two thinkos in pcie-brcmstb and nvme pci drivers #7407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98f010f
nvme: pci: use LE accessors for HMB segment table entries on arm64
P33M May 29, 2026
11aa200
pcie-brcmstb: preserve HARD_DEBUG register bits in brcm_config_clkreq()
P33M May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drivers/nvme/host/pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2431,9 +2431,9 @@ static int nvme_alloc_host_mem_multi(struct nvme_dev *dev, u64 preferred,
i = dev->nr_host_mem_descs = mapped_nents;

while (--i >= 0) {
descs[i].addr = sg_dma_address(&slist[i]);
descs[i].addr = cpu_to_le64(sg_dma_address(&slist[i]));
WARN_ON_ONCE(sg_dma_len(&slist[i]) & (NVME_CTRL_PAGE_SIZE - 1));
descs[i].size = sg_dma_len(&slist[i]) / NVME_CTRL_PAGE_SIZE;
descs[i].size = cpu_to_le32(sg_dma_len(&slist[i]) / NVME_CTRL_PAGE_SIZE);
}

dev->host_mem_size = size;
Expand Down
6 changes: 5 additions & 1 deletion drivers/pci/controller/pcie-brcmstb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,7 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie)
{
static const char err_msg[] = "invalid 'brcm,clkreq-mode' DT string\n";
const char *mode = "default";
u32 clkreq_cntl = 0;
u32 clkreq_cntl;
int ret, tmp;

ret = of_property_read_string(pcie->np, "brcm,clkreq-mode", &mode);
Expand All @@ -1584,6 +1584,10 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie)
mode = "safe";
}

/* Start out assuming safe mode (both mode bits cleared) */
clkreq_cntl = readl(pcie->base + HARD_DEBUG(pcie));
clkreq_cntl &= ~PCIE_CLKREQ_MASK;

if (strcmp(mode, "no-l1ss") == 0) {
/*
* "no-l1ss" -- Provides Clock Power Management, L0s, and
Expand Down
Loading