1 files changed, 24 insertions, 10 deletions

diff --git a/arch/mips/pci/ops-loongson3.c b/arch/mips/pci/ops-loongson3.c
index 9e118431e226..2f6ad36bdea6 100644
--- a/arch/mips/pci/ops-loongson3.c
+++ b/arch/mips/pci/ops-loongson3.c
@@ -18,22 +18,36 @@ static int loongson3_pci_config_access(unsigned char access_type,
                 int where, u32 *data)
 {
         unsigned char busnum = bus->number;
-        u_int64_t addr, type;
-        void *addrp;
-        int device = PCI_SLOT(devfn);
         int function = PCI_FUNC(devfn);
+        int device = PCI_SLOT(devfn);
         int reg = where & ~3;
+        void *addrp;
+        u64 addr;
+
+        if (where < PCI_CFG_SPACE_SIZE) { /* standard config */
+                addr = (busnum << 16) | (device << 11) | (function << 8) | reg;
+                if (busnum == 0) {
+                        if (device > 31)
+                                return PCIBIOS_DEVICE_NOT_FOUND;
+                        addrp = (void *)TO_UNCAC(HT1LO_PCICFG_BASE | addr);
+                } else {
+                        addrp = (void *)TO_UNCAC(HT1LO_PCICFG_BASE_TP1 | addr);
+                }
+        } else if (where < PCI_CFG_SPACE_EXP_SIZE) {  /* extended config */
+                struct pci_dev *rootdev;
+
+                rootdev = pci_get_domain_bus_and_slot(0, 0, 0);
+                if (!rootdev)
+                        return PCIBIOS_DEVICE_NOT_FOUND;
 
-        addr = (busnum << 16) | (device << 11) | (function << 8) | reg;
-        if (busnum == 0) {
-                if (device > 31)
+                addr = pci_resource_start(rootdev, 3);
+                if (!addr)
                         return PCIBIOS_DEVICE_NOT_FOUND;
-                addrp = (void *)(TO_UNCAC(HT1LO_PCICFG_BASE) | (addr & 0xffff));
-                type = 0;
 
+                addr |= busnum << 20 | device << 15 | function << 12 | reg;
+                addrp = (void *)TO_UNCAC(addr);
         } else {
-                addrp = (void *)(TO_UNCAC(HT1LO_PCICFG_BASE_TP1) | (addr));
-                type = 0x10000;
+                return PCIBIOS_DEVICE_NOT_FOUND;
         }
 
         if (access_type == PCI_ACCESS_WRITE)