diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-12 20:49:39 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-12 20:49:39 -0500 |
| commit | a02af84e03e018d7cd08bb3070cbe5517004712b (patch) | |
| tree | aeea10cced79093b8cb35974c410d1c2604e69ba /drivers/pci/pci_tegra.c | |
| parent | f0c91296015a5976a7b4a6c01892a404c18ced83 (diff) | |
| parent | 2a67bf65dd6c362487f416878348398d1842ae6b (diff) | |
Merge branch '2022-01-12-pci-updates'
- PCI code clean up and bug fixes from Pali
Diffstat (limited to 'drivers/pci/pci_tegra.c')
| -rw-r--r-- | drivers/pci/pci_tegra.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index 9cb4414836f..fc05ee00f1f 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -275,13 +275,6 @@ static void rp_writel(struct tegra_pcie_port *port, unsigned long value, writel(value, port->regs.start + offset); } -static unsigned long tegra_pcie_conf_offset(pci_dev_t bdf, int where) -{ - return ((where & 0xf00) << 16) | (PCI_BUS(bdf) << 16) | - (PCI_DEV(bdf) << 11) | (PCI_FUNC(bdf) << 8) | - (where & 0xfc); -} - static int tegra_pcie_conf_address(struct tegra_pcie *pcie, pci_dev_t bdf, int where, unsigned long *address) { @@ -305,7 +298,9 @@ static int tegra_pcie_conf_address(struct tegra_pcie *pcie, pci_dev_t bdf, return -EFAULT; #endif - *address = pcie->cs.start + tegra_pcie_conf_offset(bdf, where); + *address = pcie->cs.start + + (PCI_CONF1_EXT_ADDRESS(PCI_BUS(bdf), PCI_DEV(bdf), + PCI_FUNC(bdf), where) & ~PCI_CONF1_ENABLE); return 0; } } |