Merge tag 'mips_6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[linux-block.git] / arch / mips / pci / pcie-octeon.c

diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
old mode 100644 (file)
new mode 100755 (executable)
index 2583e31..b080c7c
--- a/arch/mips/pci/pcie-octeon.c
+++ b/arch/mips/pci/pcie-octeon.c
@@ -230,12 +230,18 @@ static inline uint64_t __cvmx_pcie_build_config_addr(int pcie_port, int bus,
 {
        union cvmx_pcie_address pcie_addr;
        union cvmx_pciercx_cfg006 pciercx_cfg006;
+       union cvmx_pciercx_cfg032 pciercx_cfg032;
 
        pciercx_cfg006.u32 =
            cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG006(pcie_port));
        if ((bus <= pciercx_cfg006.s.pbnum) && (dev != 0))
                return 0;
 
+       pciercx_cfg032.u32 =
+               cvmx_pcie_cfgx_read(pcie_port, CVMX_PCIERCX_CFG032(pcie_port));
+       if ((pciercx_cfg032.s.dlla == 0) || (pciercx_cfg032.s.lt == 1))
+               return 0;
+
        pcie_addr.u64 = 0;
        pcie_addr.config.upper = 2;
        pcie_addr.config.io = 1;