From: Marc Zyngier <maz@xxxxxxxxxx> commit 825da4e9cec68713fbb02dc6f71fe1bf65fe8050 upstream. 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@xxxxxxxxxx Fixes: c7a75d07827a ("PCI: xgene: Fix IB window setup") Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Cc: Rob Herring <robh@xxxxxxxxxx> Cc: Toan Le <toan@xxxxxxxxxxxxxxxxxxxxxx> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx> Cc: Krzysztof Wilczyński <kw@xxxxxxxxx> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> Cc: Stéphane Graber <stgraber@xxxxxxxxxx> Cc: dann frazier <dann.frazier@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/pci/controller/pci-xgene.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/pci/controller/pci-xgene.c +++ b/drivers/pci/controller/pci-xgene.c @@ -465,7 +465,7 @@ static int xgene_pcie_select_ib_reg(u8 * 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; } Patches currently in stable-queue which might be from maz@xxxxxxxxxx are queue-5.17/arm64-dts-ti-k3-j721e-fix-gic-v3-compatible-regs.patch queue-5.17/arm64-dts-ti-k3-j7200-fix-gic-v3-compatible-regs.patch queue-5.17/arm64-dts-ti-k3-am64-fix-gic-v3-compatible-regs.patch queue-5.17/arm64-dts-ti-k3-j721s2-fix-gic-v3-compatible-regs.patch queue-5.17/arm64-dts-ti-k3-am65-fix-gic-v3-compatible-regs.patch queue-5.17/pci-xgene-revert-pci-xgene-fix-ib-window-setup.patch queue-5.17/pci-xgene-revert-pci-xgene-use-inbound-resources-for-setup.patch