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.
Cc: Rob Herring robh@kernel.org Cc: Toan Le toan@os.amperecomputing.com Cc: Lorenzo Pieralisi lorenzo.pieralisi@arm.com Cc: Krzysztof Wilczyński kw@linux.com Cc: Bjorn Helgaas bhelgaas@google.com Cc: Stéphane Graber stgraber@ubuntu.com Cc: dann frazier dann.frazier@canonical.com Cc: stable@vger.kernel.org Signed-off-by: Marc Zyngier maz@kernel.org Fixes: c7a75d07827a ("PCI: xgene: Fix IB window setup") Link: https://lore.kernel.org/r/YjN8pT5e6/8cRohQ@xps13.dannf --- 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 aa41ceaf031f..7c763d820c52 100644 --- 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 *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; }