[SRU Impish][PATCH 1/2] PCI: xgene: Revert "PCI: xgene: Fix IB window setup"

dann frazier dann.frazier at canonical.com
Wed Jun 15 22:45:17 UTC 2022

From: Marc Zyngier <maz at kernel.org>

BugLink: https://bugs.launchpad.net/bugs/1952933

Commit c7a75d07827a ("PCI: xgene: Fix IB window setup") tried to
fix the damages that 6dce5aa59e0b ("PCI: xgene: Use inbound resources
for setup") caused, but actually didn't improve anything for some
plarforms (at least Mustang and m400 are still broken).

Given that 6dce5aa59e0b has been reverted, revert this patch as well,
restoring the PCIe support on XGene to its pre-5.5, working state.

Link: https://lore.kernel.org/r/YjN8pT5e6/8cRohQ@xps13.dannf
Link: https://lore.kernel.org/r/20220321104843.949645-3-maz@kernel.org
Fixes: c7a75d07827a ("PCI: xgene: Fix IB window setup")
Signed-off-by: Marc Zyngier <maz at kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi at arm.com>
Cc: stable at vger.kernel.org
Cc: Rob Herring <robh at kernel.org>
Cc: Toan Le <toan at os.amperecomputing.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi at arm.com>
Cc: Krzysztof Wilczyński <kw at linux.com>
Cc: Bjorn Helgaas <bhelgaas at google.com>
Cc: Stéphane Graber <stgraber at ubuntu.com>
Cc: dann frazier <dann.frazier at canonical.com>
(cherry picked from commit 825da4e9cec68713fbb02dc6f71fe1bf65fe8050)
Signed-off-by: dann frazier <dann.frazier at canonical.com>
 drivers/pci/controller/pci-xgene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index 532937693872..7f503dd4ff81 100644
--- a/drivers/pci/controller/pci-xgene.c
+++ b/drivers/pci/controller/pci-xgene.c
@@ -466,7 +466,7 @@ static int xgene_pcie_select_ib_reg(u8 *ib_reg_mask, u64 size)
 		return 1;
-	if ((size > SZ_1K) && (size < SZ_4G) && !(*ib_reg_mask & (1 << 0))) {
+	if ((size > SZ_1K) && (size < SZ_1T) && !(*ib_reg_mask & (1 << 0))) {
 		*ib_reg_mask |= (1 << 0);
 		return 0;

More information about the kernel-team mailing list