[AMD Official Use Only - AMD Internal Distribution Only]
Hi,
I would like to withdraw this patch.
Apologies for any confusion - this patch was not intended for mainline submission. Please disregard it.
Thank you for your understanding.
Regards, Sai Krishna
-----Original Message----- From: Sai Krishna Musham sai.krishna.musham@amd.com Sent: Saturday, October 11, 2025 6:56 AM To: git-dev (AMD-Xilinx) git-dev@amd.com; Simek, Michal michal.simek@amd.com Cc: Yeleswarapu, Nagaradhesh nagaradhesh.yeleswarapu@amd.com; Musham, Sai Krishna sai.krishna.musham@amd.com; Jani Nurminen jani.nurminen@windriver.com; Manivannan Sadhasivam mani@kernel.org; Bjorn Helgaas bhelgaas@google.com; stable@vger.kernel.org Subject: [LINUX PATCH] PCI: xilinx-nwl: Fix ECAM programming
From: Jani Nurminen jani.nurminen@windriver.com
When PCIe has been set up by the bootloader, the ecam_size field in the E_ECAM_CONTROL register already contains a value.
The driver previously programmed it to 0xc (for 16 busses; 16 MB), but bumped to 0x10 (for 256 busses; 256 MB) by the commit 2fccd11518f1 ("PCI: xilinx-nwl: Modify ECAM size to enable support for 256 buses").
Regardless of what the bootloader has programmed, the driver ORs in a new maximal value without doing a proper RMW sequence. This can lead to problems.
For example, if the bootloader programs in 0xc and the driver uses 0x10, the ORed result is 0x1c, which is beyond the ecam_max_size limit of 0x10 (from E_ECAM_CAPABILITIES).
Avoid the problems by doing a proper RMW.
Fixes: 2fccd11518f1 ("PCI: xilinx-nwl: Modify ECAM size to enable support for 256 buses") Signed-off-by: Jani Nurminen jani.nurminen@windriver.com [mani: added stable tag] Signed-off-by: Manivannan Sadhasivam mani@kernel.org Signed-off-by: Bjorn Helgaas bhelgaas@google.com Cc: stable@vger.kernel.org Link: https://patch.msgid.link/e83a2af2-af0b-4670-bcf5- ad408571c2b0@windriver.com
CR: CR-1250694 Branch: master-next-test
drivers/pci/controller/pcie-xilinx-nwl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx- nwl.c index a91eed8812c8..63494b67e42b 100644 --- a/drivers/pci/controller/pcie-xilinx-nwl.c +++ b/drivers/pci/controller/pcie-xilinx-nwl.c @@ -665,9 +665,10 @@ static int nwl_pcie_bridge_init(struct nwl_pcie *pcie) nwl_bridge_writel(pcie, nwl_bridge_readl(pcie, E_ECAM_CONTROL) | E_ECAM_CR_ENABLE, E_ECAM_CONTROL);
nwl_bridge_writel(pcie, nwl_bridge_readl(pcie, E_ECAM_CONTROL) |(NWL_ECAM_MAX_SIZE << E_ECAM_SIZE_SHIFT),E_ECAM_CONTROL);
ecam_val = nwl_bridge_readl(pcie, E_ECAM_CONTROL);ecam_val &= ~E_ECAM_SIZE_LOC;ecam_val |= NWL_ECAM_MAX_SIZE << E_ECAM_SIZE_SHIFT;nwl_bridge_writel(pcie, ecam_val, E_ECAM_CONTROL); nwl_bridge_writel(pcie, lower_32_bits(pcie->phys_ecam_base), E_ECAM_BASE_LO);-- 2.44.1