1 files changed, 53 insertions, 27 deletions

diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c
index 8a17a39e5bf2..31c150196595 100644
--- a/arch/mips/pci/ops-tx3927.c
+++ b/arch/mips/pci/ops-tx3927.c
@@ -37,45 +37,48 @@
 #include <linux/pci.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 
 #include <asm/addrspace.h>
+#include <asm/txx9irq.h>
+#include <asm/txx9/pci.h>
 #include <asm/txx9/tx3927.h>
 
-static inline int mkaddr(unsigned char bus, unsigned char dev_fn,
-        unsigned char where)
+static int mkaddr(struct pci_bus *bus, unsigned char devfn, unsigned char where)
 {
-        if (bus == 0 && dev_fn >= PCI_DEVFN(TX3927_PCIC_MAX_DEVNU, 0))
-                return PCIBIOS_DEVICE_NOT_FOUND;
-
-        tx3927_pcicptr->ica = ((bus & 0xff) << 0x10) |
-                              ((dev_fn & 0xff) << 0x08) |
-                              (where & 0xfc);
+        if (bus->parent == NULL &&
+            devfn >= PCI_DEVFN(TX3927_PCIC_MAX_DEVNU, 0))
+                return -1;
+        tx3927_pcicptr->ica =
+                ((bus->number & 0xff) << 0x10) |
+                ((devfn & 0xff) << 0x08) |
+                (where & 0xfc) | (bus->parent ? 1 : 0);
 
         /* clear M_ABORT and Disable M_ABORT Int. */
         tx3927_pcicptr->pcistat |= PCI_STATUS_REC_MASTER_ABORT;
         tx3927_pcicptr->pcistatim &= ~PCI_STATUS_REC_MASTER_ABORT;
-
-        return PCIBIOS_SUCCESSFUL;
+        return 0;
 }
 
 static inline int check_abort(void)
 {
-        if (tx3927_pcicptr->pcistat & PCI_STATUS_REC_MASTER_ABORT)
+        if (tx3927_pcicptr->pcistat & PCI_STATUS_REC_MASTER_ABORT) {
                 tx3927_pcicptr->pcistat |= PCI_STATUS_REC_MASTER_ABORT;
                 tx3927_pcicptr->pcistatim |= PCI_STATUS_REC_MASTER_ABORT;
+                /* flush write buffer */
+                iob();
                 return PCIBIOS_DEVICE_NOT_FOUND;
-
+        }
         return PCIBIOS_SUCCESSFUL;
 }
 
 static int tx3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,
         int where, int size, u32 * val)
 {
-        int ret;
-
-        ret = mkaddr(bus->number, devfn, where);
-        if (ret)
-                return ret;
+        if (mkaddr(bus, devfn, where)) {
+                *val = 0xffffffff;
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        }
 
         switch (size) {
         case 1:
@@ -97,11 +100,8 @@ static int tx3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,
 static int tx3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
         int where, int size, u32 val)
 {
-        int ret;
-
-        ret = mkaddr(bus->number, devfn, where);
-        if (ret)
-                return ret;
+        if (mkaddr(bus, devfn, where))
+                return PCIBIOS_DEVICE_NOT_FOUND;
 
         switch (size) {
         case 1:
@@ -117,11 +117,6 @@ static int tx3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
                 tx3927_pcicptr->icd = cpu_to_le32(val);
         }
 
-        if (tx3927_pcicptr->pcistat & PCI_STATUS_REC_MASTER_ABORT)
-                tx3927_pcicptr->pcistat |= PCI_STATUS_REC_MASTER_ABORT;
-                tx3927_pcicptr->pcistatim |= PCI_STATUS_REC_MASTER_ABORT;
-                return PCIBIOS_DEVICE_NOT_FOUND;
-
         return check_abort();
 }
 
@@ -202,3 +197,34 @@ void __init tx3927_pcic_setup(struct pci_controller *channel,
                 PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
         local_irq_restore(flags);
 }
+
+static irqreturn_t tx3927_pcierr_interrupt(int irq, void *dev_id)
+{
+        struct pt_regs *regs = get_irq_regs();
+
+        if (txx9_pci_err_action != TXX9_PCI_ERR_IGNORE) {
+                printk(KERN_WARNING "PCI error interrupt at 0x%08lx.\n",
+                       regs->cp0_epc);
+                printk(KERN_WARNING "pcistat:%02x, lbstat:%04lx\n",
+                       tx3927_pcicptr->pcistat, tx3927_pcicptr->lbstat);
+        }
+        if (txx9_pci_err_action != TXX9_PCI_ERR_PANIC) {
+                /* clear all pci errors */
+                tx3927_pcicptr->pcistat |= TX3927_PCIC_PCISTATIM_ALL;
+                tx3927_pcicptr->istat = TX3927_PCIC_IIM_ALL;
+                tx3927_pcicptr->tstat = TX3927_PCIC_TIM_ALL;
+                tx3927_pcicptr->lbstat = TX3927_PCIC_LBIM_ALL;
+                return IRQ_HANDLED;
+        }
+        console_verbose();
+        panic("PCI error.");
+}
+
+void __init tx3927_setup_pcierr_irq(void)
+{
+        if (request_irq(TXX9_IRQ_BASE + TX3927_IR_PCI,
+                        tx3927_pcierr_interrupt,
+                        IRQF_DISABLED, "PCI error",
+                        (void *)TX3927_PCIC_REG))
+                printk(KERN_WARNING "Failed to request irq for PCIERR\n");
+}