PCI: keystone: Add debug error message for all errors

commit 025dd3daeda77f61a280da87ae701 ("PCI: keystone: Add error IRQ
handler") added dev_err() message only for ERR_AXI and ERR_FATAL. Add
debug error message for ERR_SYS, ERR_NONFATAL, ERR_CORR and ERR_AER here.

While at that avoid using ERR_IRQ_STATUS_RAW and use ERR_IRQ_STATUS
instead.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index c0bba7b604faaab4092118f1847589eefd82ebee..e9e646acc2d563f5a54a491218588fb624d402c9 100644 (file)
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -79,7 +79,6 @@
 #define ERR_SYS                BIT(0)  /* System (fatal, non-fatal, or correctable) */
 #define ERR_IRQ_ALL    (ERR_AER | ERR_AXI | ERR_CORR | \
                         ERR_NONFATAL | ERR_FATAL | ERR_SYS)
-#define ERR_FATAL_IRQ  (ERR_FATAL | ERR_AXI)
 #define ERR_IRQ_STATUS                 0x1c4
 #define ERR_IRQ_ENABLE_SET             0x1c8
 #define ERR_IRQ_ENABLE_CLR             0x1cc
@@ -246,18 +245,33 @@ static void ks_pcie_enable_error_irq(struct keystone_pcie *ks_pcie)
 
 static irqreturn_t ks_pcie_handle_error_irq(struct keystone_pcie *ks_pcie)
 {
-       u32 status;
+       u32 reg;
+       struct device *dev = ks_pcie->pci->dev;
 
-       status = ks_pcie_app_readl(ks_pcie, ERR_IRQ_STATUS);
-       if (!status)
+       reg = ks_pcie_app_readl(ks_pcie, ERR_IRQ_STATUS);
+       if (!reg)
                return IRQ_NONE;
 
-       if (status & ERR_FATAL_IRQ)
-               dev_err(ks_pcie->pci->dev, "fatal error (status %#010x)\n",
-                       status);
+       if (reg & ERR_SYS)
+               dev_err(dev, "System Error\n");
+
+       if (reg & ERR_FATAL)
+               dev_err(dev, "Fatal Error\n");
+
+       if (reg & ERR_NONFATAL)
+               dev_dbg(dev, "Non Fatal Error\n");
+
+       if (reg & ERR_CORR)
+               dev_dbg(dev, "Correctable Error\n");
+
+       if (reg & ERR_AXI)
+               dev_err(dev, "AXI tag lookup fatal Error\n");
+
+       if (reg & ERR_AER)
+               dev_err(dev, "ECRC Error\n");
+
+       ks_pcie_app_writel(ks_pcie, ERR_IRQ_STATUS, reg);
 
-       /* Ack the IRQ; status bits are RW1C */
-       ks_pcie_app_writel(ks_pcie, ERR_IRQ_STATUS, status);
        return IRQ_HANDLED;
 }