PCI: tegra: Use PCI_CONF1_EXT_ADDRESS() macro

Simplify pci-tegra.c driver code and use new PCI_CONF1_EXT_ADDRESS() macro
for accessing PCI config space.

Link: https://lore.kernel.org/r/20220928121911.14994-1-pali@kernel.org
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Acked-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index 8e323e93be91576b3bb988c57696e37d858c4cbd..24478ae5a345d1fc3145e736f55dfa7c5b479ab7 100644 (file)
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -415,13 +415,6 @@ 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)
@@ -443,7 +436,9 @@ static void __iomem *tegra_pcie_map_bus(struct pci_bus *bus,
                unsigned int offset;
                u32 base;
 
-               offset = tegra_pcie_conf_offset(bus->number, devfn, where);
+               offset = PCI_CONF1_EXT_ADDRESS(bus->number, PCI_SLOT(devfn),
+                                              PCI_FUNC(devfn), where) &
+                        ~PCI_CONF1_ENABLE;
 
                /* move 4 KiB window to offset within the FPCI region */
                base = 0xfe100000 + ((offset & ~(SZ_4K - 1)) >> 8);