sparc64: Commonize large portions of PSYCHO error handling.

The IOMMU and streaming cache error interrogation is moved here
as well as the PCI error interrupt handler.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 218 deletions

diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index ae11d67388e1..f8089aa84f64 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -210,95 +210,6 @@
 static int hummingbird_p;
 static struct pci_bus *sabre_root_bus;
 
-/* SABRE error handling support. */
-static void sabre_check_iommu_error(struct pci_pbm_info *pbm,
-                                    unsigned long afsr,
-                                    unsigned long afar)
-{
-        struct iommu *iommu = pbm->iommu;
-        unsigned long iommu_tag[16];
-        unsigned long iommu_data[16];
-        unsigned long flags;
-        u64 control;
-        int i;
-
-        spin_lock_irqsave(&iommu->lock, flags);
-        control = sabre_read(iommu->iommu_control);
-        if (control & SABRE_IOMMUCTRL_ERR) {
-                char *type_string;
-
-                /* Clear the error encountered bit.
-                 * NOTE: On Sabre this is write 1 to clear,
-                 *       which is different from Psycho.
-                 */
-                sabre_write(iommu->iommu_control, control);
-                switch((control & SABRE_IOMMUCTRL_ERRSTS) >> 25UL) {
-                case 1:
-                        type_string = "Invalid Error";
-                        break;
-                case 3:
-                        type_string = "ECC Error";
-                        break;
-                default:
-                        type_string = "Unknown";
-                        break;
-                };
-                printk("%s: IOMMU Error, type[%s]\n",
-                       pbm->name, type_string);
-
-                /* Enter diagnostic mode and probe for error'd
-                 * entries in the IOTLB.
-                 */
-                control &= ~(SABRE_IOMMUCTRL_ERRSTS | SABRE_IOMMUCTRL_ERR);
-                sabre_write(iommu->iommu_control,
-                            (control | SABRE_IOMMUCTRL_DENAB));
-                for (i = 0; i < 16; i++) {
-                        unsigned long base = pbm->controller_regs;
-
-                        iommu_tag[i] =
-                                sabre_read(base + SABRE_IOMMU_TAG + (i * 8UL));
-                        iommu_data[i] =
-                                sabre_read(base + SABRE_IOMMU_DATA + (i * 8UL));
-                        sabre_write(base + SABRE_IOMMU_TAG + (i * 8UL), 0);
-                        sabre_write(base + SABRE_IOMMU_DATA + (i * 8UL), 0);
-                }
-                sabre_write(iommu->iommu_control, control);
-
-                for (i = 0; i < 16; i++) {
-                        unsigned long tag, data;
-
-                        tag = iommu_tag[i];
-                        if (!(tag & SABRE_IOMMUTAG_ERR))
-                                continue;
-
-                        data = iommu_data[i];
-                        switch((tag & SABRE_IOMMUTAG_ERRSTS) >> 23UL) {
-                        case 1:
-                                type_string = "Invalid Error";
-                                break;
-                        case 3:
-                                type_string = "ECC Error";
-                                break;
-                        default:
-                                type_string = "Unknown";
-                                break;
-                        };
-                        printk("%s: IOMMU TAG(%d)[RAW(%016lx)error(%s)wr(%d)sz(%dK)vpg(%08lx)]\n",
-                               pbm->name, i, tag, type_string,
-                               ((tag & SABRE_IOMMUTAG_WRITE) ? 1 : 0),
-                               ((tag & SABRE_IOMMUTAG_SIZE) ? 64 : 8),
-                               ((tag & SABRE_IOMMUTAG_VPN) << IOMMU_PAGE_SHIFT));
-                        printk("%s: IOMMU DATA(%d)[RAW(%016lx)valid(%d)used(%d)cache(%d)ppg(%016lx)\n",
-                               pbm->name, i, data,
-                               ((data & SABRE_IOMMUDATA_VALID) ? 1 : 0),
-                               ((data & SABRE_IOMMUDATA_USED) ? 1 : 0),
-                               ((data & SABRE_IOMMUDATA_CACHE) ? 1 : 0),
-                               ((data & SABRE_IOMMUDATA_PPN) << IOMMU_PAGE_SHIFT));
-                }
-        }
-        spin_unlock_irqrestore(&iommu->lock, flags);
-}
-
 static irqreturn_t sabre_ue_intr(int irq, void *dev_id)
 {
         struct pci_pbm_info *pbm = dev_id;
@@ -354,7 +265,7 @@ static irqreturn_t sabre_ue_intr(int irq, void *dev_id)
         printk("]\n");
 
         /* Interrogate IOMMU for error status. */
-        sabre_check_iommu_error(pbm, afsr, afar);
+        psycho_check_iommu_error(pbm, afsr, afar, UE_ERR);
 
         return IRQ_HANDLED;
 }
@@ -415,133 +326,6 @@ static irqreturn_t sabre_ce_intr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static irqreturn_t sabre_pcierr_intr_other(struct pci_pbm_info *pbm)
-{
-        unsigned long csr_reg, csr, csr_error_bits;
-        irqreturn_t ret = IRQ_NONE;
-        u16 stat;
-
-        csr_reg = pbm->controller_regs + SABRE_PCICTRL;
-        csr = sabre_read(csr_reg);
-        csr_error_bits =
-                csr & SABRE_PCICTRL_SERR;
-        if (csr_error_bits) {
-                /* Clear the errors.  */
-                sabre_write(csr_reg, csr);
-
-                /* Log 'em.  */
-                if (csr_error_bits & SABRE_PCICTRL_SERR)
-                        printk("%s: PCI SERR signal asserted.\n",
-                               pbm->name);
-                ret = IRQ_HANDLED;
-        }
-        pci_bus_read_config_word(sabre_root_bus, 0,
-                                 PCI_STATUS, &stat);
-        if (stat & (PCI_STATUS_PARITY |
-                    PCI_STATUS_SIG_TARGET_ABORT |
-                    PCI_STATUS_REC_TARGET_ABORT |
-                    PCI_STATUS_REC_MASTER_ABORT |
-                    PCI_STATUS_SIG_SYSTEM_ERROR)) {
-                printk("%s: PCI bus error, PCI_STATUS[%04x]\n",
-                       pbm->name, stat);
-                pci_bus_write_config_word(sabre_root_bus, 0,
-                                          PCI_STATUS, 0xffff);
-                ret = IRQ_HANDLED;
-        }
-        return ret;
-}
-
-static irqreturn_t sabre_pcierr_intr(int irq, void *dev_id)
-{
-        struct pci_pbm_info *pbm = dev_id;
-        unsigned long afsr_reg, afar_reg;
-        unsigned long afsr, afar, error_bits;
-        int reported;
-
-        afsr_reg = pbm->controller_regs + SABRE_PIOAFSR;
-        afar_reg = pbm->controller_regs + SABRE_PIOAFAR;
-
-        /* Latch error status. */
-        afar = sabre_read(afar_reg);
-        afsr = sabre_read(afsr_reg);
-
-        /* Clear primary/secondary error status bits. */
-        error_bits = afsr &
-                (SABRE_PIOAFSR_PMA | SABRE_PIOAFSR_PTA |
-                 SABRE_PIOAFSR_PRTRY | SABRE_PIOAFSR_PPERR |
-                 SABRE_PIOAFSR_SMA | SABRE_PIOAFSR_STA |
-                 SABRE_PIOAFSR_SRTRY | SABRE_PIOAFSR_SPERR);
-        if (!error_bits)
-                return sabre_pcierr_intr_other(pbm);
-        sabre_write(afsr_reg, error_bits);
-
-        /* Log the error. */
-        printk("%s: PCI Error, primary error type[%s]\n",
-               pbm->name,
-               (((error_bits & SABRE_PIOAFSR_PMA) ?
-                 "Master Abort" :
-                 ((error_bits & SABRE_PIOAFSR_PTA) ?
-                  "Target Abort" :
-                  ((error_bits & SABRE_PIOAFSR_PRTRY) ?
-                   "Excessive Retries" :
-                   ((error_bits & SABRE_PIOAFSR_PPERR) ?
-                    "Parity Error" : "???"))))));
-        printk("%s: bytemask[%04lx] was_block(%d)\n",
-               pbm->name,
-               (afsr & SABRE_PIOAFSR_BMSK) >> 32UL,
-               (afsr & SABRE_PIOAFSR_BLK) ? 1 : 0);
-        printk("%s: PCI AFAR [%016lx]\n", pbm->name, afar);
-        printk("%s: PCI Secondary errors [", pbm->name);
-        reported = 0;
-        if (afsr & SABRE_PIOAFSR_SMA) {
-                reported++;
-                printk("(Master Abort)");
-        }
-        if (afsr & SABRE_PIOAFSR_STA) {
-                reported++;
-                printk("(Target Abort)");
-        }
-        if (afsr & SABRE_PIOAFSR_SRTRY) {
-                reported++;
-                printk("(Excessive Retries)");
-        }
-        if (afsr & SABRE_PIOAFSR_SPERR) {
-                reported++;
-                printk("(Parity Error)");
-        }
-        if (!reported)
-                printk("(none)");
-        printk("]\n");
-
-        /* For the error types shown, scan both PCI buses for devices
-         * which have logged that error type.
-         */
-
-        /* If we see a Target Abort, this could be the result of an
-         * IOMMU translation error of some sort.  It is extremely
-         * useful to log this information as usually it indicates
-         * a bug in the IOMMU support code or a PCI device driver.
-         */
-        if (error_bits & (SABRE_PIOAFSR_PTA | SABRE_PIOAFSR_STA)) {
-                sabre_check_iommu_error(pbm, afsr, afar);
-                pci_scan_for_target_abort(pbm, pbm->pci_bus);
-        }
-        if (error_bits & (SABRE_PIOAFSR_PMA | SABRE_PIOAFSR_SMA))
-                pci_scan_for_master_abort(pbm, pbm->pci_bus);
-
-        /* For excessive retries, SABRE/PBM will abort the device
-         * and there is no way to specifically check for excessive
-         * retries in the config space status registers.  So what
-         * we hope is that we'll catch it via the master/target
-         * abort events.
-         */
-
-        if (error_bits & (SABRE_PIOAFSR_PPERR | SABRE_PIOAFSR_SPERR))
-                pci_scan_for_parity_error(pbm, pbm->pci_bus);
-
-        return IRQ_HANDLED;
-}
-
 static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
 {
         struct device_node *dp = pbm->op->node;
@@ -588,7 +372,7 @@ static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
         if (err)
                 printk(KERN_WARNING "%s: Couldn't register CE, err=%d.\n",
                        pbm->name, err);
-        err = request_irq(op->irqs[0], sabre_pcierr_intr, 0,
+        err = request_irq(op->irqs[0], psycho_pcierr_intr, 0,
                           "SABRE_PCIERR", pbm);
         if (err)
                 printk(KERN_WARNING "%s: Couldn't register PCIERR, err=%d.\n",
@@ -679,6 +463,9 @@ static void __init sabre_pbm_init(struct pci_pbm_info *pbm,
                                   struct of_device *op)
 {
         psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE);
+        pbm->pci_afsr = pbm->controller_regs + SABRE_PIOAFSR;
+        pbm->pci_afar = pbm->controller_regs + SABRE_PIOAFAR;
+        pbm->pci_csr = pbm->controller_regs + SABRE_PCICTRL;
         sabre_scan_bus(pbm, &op->dev);
 }