1 files changed, 48 insertions, 32 deletions

diff --git a/arch/mips/pci/ops-tx4938.c b/arch/mips/pci/ops-tx4938.c
index 445007084515..a450c4062031 100644
--- a/arch/mips/pci/ops-tx4938.c
+++ b/arch/mips/pci/ops-tx4938.c
@@ -46,50 +46,63 @@ struct resource tx4938_pcic1_pci_mem_resource = {
         .flags  = IORESOURCE_MEM
 };
 
-static int mkaddr(int bus, int dev_fn, int where, int *flagsp)
+static int mkaddr(int bus, int dev_fn, int where,
+                  struct tx4938_pcic_reg *pcicptr)
 {
         if (bus > 0) {
                 /* Type 1 configuration */
-                tx4938_pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
+                pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
                     ((dev_fn & 0xff) << 0x08) | (where & 0xfc) | 1;
         } else {
                 if (dev_fn >= PCI_DEVFN(TX4938_PCIC_MAX_DEVNU, 0))
                         return -1;
 
                 /* Type 0 configuration */
-                tx4938_pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
+                pcicptr->g2pcfgadrs = ((bus & 0xff) << 0x10) |
                     ((dev_fn & 0xff) << 0x08) | (where & 0xfc);
         }
         /* clear M_ABORT and Disable M_ABORT Int. */
-        tx4938_pcicptr->pcistatus =
-            (tx4938_pcicptr->pcistatus & 0x0000ffff) |
+        pcicptr->pcistatus =
+            (pcicptr->pcistatus & 0x0000ffff) |
             (PCI_STATUS_REC_MASTER_ABORT << 16);
-        tx4938_pcicptr->pcimask &= ~PCI_STATUS_REC_MASTER_ABORT;
+        pcicptr->pcimask &= ~PCI_STATUS_REC_MASTER_ABORT;
 
         return 0;
 }
 
-static int check_abort(int flags)
+static int check_abort(struct tx4938_pcic_reg *pcicptr)
 {
         int code = PCIBIOS_SUCCESSFUL;
         /* wait write cycle completion before checking error status */
-        while (tx4938_pcicptr->pcicstatus & TX4938_PCIC_PCICSTATUS_IWB)
+        while (pcicptr->pcicstatus & TX4938_PCIC_PCICSTATUS_IWB)
                                 ;
-        if (tx4938_pcicptr->pcistatus & (PCI_STATUS_REC_MASTER_ABORT << 16)) {
-                tx4938_pcicptr->pcistatus =
-                    (tx4938_pcicptr->
+        if (pcicptr->pcistatus & (PCI_STATUS_REC_MASTER_ABORT << 16)) {
+                pcicptr->pcistatus =
+                    (pcicptr->
                      pcistatus & 0x0000ffff) | (PCI_STATUS_REC_MASTER_ABORT
                                                 << 16);
-                tx4938_pcicptr->pcimask |= PCI_STATUS_REC_MASTER_ABORT;
+                pcicptr->pcimask |= PCI_STATUS_REC_MASTER_ABORT;
                 code = PCIBIOS_DEVICE_NOT_FOUND;
         }
         return code;
 }
 
+extern struct pci_controller tx4938_pci_controller[];
+extern struct tx4938_pcic_reg *get_tx4938_pcicptr(int ch);
+
+static struct tx4938_pcic_reg *pci_bus_to_pcicptr(struct pci_bus *bus)
+{
+        struct pci_controller *channel = bus->sysdata;
+        return get_tx4938_pcicptr(channel - &tx4938_pci_controller[0]);
+}
+
 static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,
                                         int where, int size, u32 * val)
 {
-        int flags, retval, dev, busno, func;
+        int retval, dev, busno, func;
+        struct tx4938_pcic_reg *pcicptr = pci_bus_to_pcicptr(bus);
+        void __iomem *cfgdata =
+                (void __iomem *)(unsigned long)&pcicptr->g2pcfgdata;
 
         dev = PCI_SLOT(devfn);
         func = PCI_FUNC(devfn);
@@ -101,32 +114,32 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,
                 busno = 0;
         }
 
-        if (mkaddr(busno, devfn, where, &flags))
+        if (mkaddr(busno, devfn, where, pcicptr))
                 return -1;
 
         switch (size) {
         case 1:
-                *val = *(volatile u8 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
 #ifdef __BIG_ENDIAN
-                              ((where & 3) ^ 3));
+                cfgdata += (where & 3) ^ 3;
 #else
-                              (where & 3));
+                cfgdata += where & 3;
 #endif
+                *val = __raw_readb(cfgdata);
                 break;
         case 2:
-                *val = *(volatile u16 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
 #ifdef __BIG_ENDIAN
-                                ((where & 3) ^ 2));
+                cfgdata += (where & 2) ^ 2;
 #else
-                                (where & 3));
+                cfgdata += where & 2;
 #endif
+                *val = __raw_readw(cfgdata);
                 break;
         case 4:
-                *val = tx4938_pcicptr->g2pcfgdata;
+                *val = __raw_readl(cfgdata);
                 break;
         }
 
-        retval = check_abort(flags);
+        retval = check_abort(pcicptr);
         if (retval == PCIBIOS_DEVICE_NOT_FOUND)
                 *val = 0xffffffff;
 
@@ -136,7 +149,10 @@ static int tx4938_pcibios_read_config(struct pci_bus *bus, unsigned int devfn,
 static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn, int where,
                                                 int size, u32 val)
 {
-        int flags, dev, busno, func;
+        int dev, busno, func;
+        struct tx4938_pcic_reg *pcicptr = pci_bus_to_pcicptr(bus);
+        void __iomem *cfgdata =
+                (void __iomem *)(unsigned long)&pcicptr->g2pcfgdata;
 
         busno = bus->number;
         dev = PCI_SLOT(devfn);
@@ -149,32 +165,32 @@ static int tx4938_pcibios_write_config(struct pci_bus *bus, unsigned int devfn,
                 busno = 0;
         }
 
-        if (mkaddr(busno, devfn, where, &flags))
+        if (mkaddr(busno, devfn, where, pcicptr))
                 return -1;
 
         switch (size) {
         case 1:
-                *(volatile u8 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
 #ifdef __BIG_ENDIAN
-                          ((where & 3) ^ 3)) = val;
+                cfgdata += (where & 3) ^ 3;
 #else
-                          (where & 3)) = val;
+                cfgdata += where & 3;
 #endif
+                __raw_writeb(val, cfgdata);
                 break;
         case 2:
-                *(volatile u16 *) ((unsigned long) & tx4938_pcicptr->g2pcfgdata |
 #ifdef __BIG_ENDIAN
-                        ((where & 0x3) ^ 0x2)) = val;
+                cfgdata += (where & 2) ^ 2;
 #else
-                        (where & 3)) = val;
+                cfgdata += where & 2;
 #endif
+                __raw_writew(val, cfgdata);
                 break;
         case 4:
-                tx4938_pcicptr->g2pcfgdata = val;
+                __raw_writel(val, cfgdata);
                 break;
         }
 
-        return check_abort(flags);
+        return check_abort(pcicptr);
 }
 
 struct pci_ops tx4938_pci_ops = {