Commit 897a66d2 authored by Jon Hunter's avatar Jon Hunter Committed by Bjorn Helgaas
Browse files

Revert "PCI: tegra: Use PCI_CONF1_EXT_ADDRESS() macro" 

This reverts commit 8bb7ff12.

Commit 8bb7ff12 ("PCI: tegra: Use PCI_CONF1_EXT_ADDRESS() macro")
updated the Tegra PCI driver to use the macro PCI_CONF1_EXT_ADDRESS()
instead of a local function in the Tegra PCI driver. This broke PCI for
some Tegra platforms because, when calculating the offset value, the mask
applied to the lower 8-bits changed from 0xff to 0xfc.

For now, fix this by reverting this commit.

Fixes: 8bb7ff12 ("PCI: tegra: Use PCI_CONF1_EXT_ADDRESS() macro")
Link: https://lore.kernel.org/r/20221017084006.11770-1-jonathanh@nvidia.com


Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarLorenzo Pieralisi <lpieralisi@kernel.org>
parent 9abf2313

drivers/pci/controller/pci-tegra.c

+8 −3
Original line number Diff line number Diff line
@@ -415,6 +415,13 @@ static inline u32 pads_readl(struct tegra_pcie *pcie, unsigned long offset) 
 * address (access to which generates correct config transaction) falls in

 * this 4 KiB region.

 */

static unsigned int tegra_pcie_conf_offset(u8 bus, unsigned int devfn,

					   unsigned int where)

{

	return ((where & 0xf00) << 16) | (bus << 16) | (PCI_SLOT(devfn) << 11) |

	       (PCI_FUNC(devfn) << 8) | (where & 0xff);

}



static void __iomem *tegra_pcie_map_bus(struct pci_bus *bus,

					unsigned int devfn,

					int where)
@@ -436,9 +443,7 @@ static void __iomem *tegra_pcie_map_bus(struct pci_bus *bus, 
		unsigned int offset;

		u32 base;



		offset = PCI_CONF1_EXT_ADDRESS(bus->number, PCI_SLOT(devfn),

					       PCI_FUNC(devfn), where) &

			 ~PCI_CONF1_ENABLE;

		offset = tegra_pcie_conf_offset(bus->number, devfn, where);



		/* move 4 KiB window to offset within the FPCI region */

		base = 0xfe100000 + ((offset & ~(SZ_4K - 1)) >> 8);