PCI: xilinx: Unify INTx & MSI interrupt decode

The INTx & MSI interrupt decode paths duplicated a fair bit of common
functionality. They also strictly handled interrupts in order of INTx then
MSI, so if both types of interrupt were to be asserted simultaneously and
the MSI interrupt were first in the FIFO then the INTx code would read it &
ignore it before the MSI code then had to read it again, wasting the
original FIFO read.

Unify the INTx & MSI decode in order to reduce that duplication & allow a
single FIFO read to be performed for each interrupt regardless of its type.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Bharat Kumar Gogada <bharatku@xilinx.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Ravikiran Gummaluri <rgummal@xilinx.com>

diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
index 9a8d5ad1dd701ffcc88ca903011856318a90328d..a7880bed56fc04f31d0e02ce81361276a21546e0 100644 (file)
--- a/drivers/pci/host/pcie-xilinx.c
+++ b/drivers/pci/host/pcie-xilinx.c
@@ -385,7 +385,7 @@ static irqreturn_t xilinx_pcie_intr_handler(int irq, void *data)
 {
        struct xilinx_pcie_port *port = (struct xilinx_pcie_port *)data;
        struct device *dev = port->dev;
-       u32 val, mask, status, msi_data;
+       u32 val, mask, status;
 
        /* Read interrupt decode and mask registers */
        val = pcie_read(port, XILINX_PCIE_REG_IDR);
@@ -425,8 +425,7 @@ static irqreturn_t xilinx_pcie_intr_handler(int irq, void *data)
                xilinx_pcie_clear_err_interrupts(port);
        }
 
-       if (status & XILINX_PCIE_INTR_INTX) {
-               /* INTx interrupt received */
+       if (status & (XILINX_PCIE_INTR_INTX | XILINX_PCIE_INTR_MSI)) {
                val = pcie_read(port, XILINX_PCIE_REG_RPIFR1);
 
                /* Check whether interrupt valid */
@@ -435,41 +434,24 @@ static irqreturn_t xilinx_pcie_intr_handler(int irq, void *data)
                        goto error;
                }
 
-               if (!(val & XILINX_PCIE_RPIFR1_MSI_INTR)) {
-                       /* Clear interrupt FIFO register 1 */
-                       pcie_write(port, XILINX_PCIE_RPIFR1_ALL_MASK,
-                                  XILINX_PCIE_REG_RPIFR1);
-
-                       /* Handle INTx Interrupt */
+               /* Decode the IRQ number */
+               if (val & XILINX_PCIE_RPIFR1_MSI_INTR) {
+                       val = pcie_read(port, XILINX_PCIE_REG_RPIFR2) &
+                               XILINX_PCIE_RPIFR2_MSG_DATA;
+               } else {
                        val = (val & XILINX_PCIE_RPIFR1_INTR_MASK) >>
                                XILINX_PCIE_RPIFR1_INTR_SHIFT;
-                       generic_handle_irq(irq_find_mapping(port->leg_domain,
-                                                           val));
+                       val = irq_find_mapping(port->leg_domain, val);
                }
-       }
 
-       if (status & XILINX_PCIE_INTR_MSI) {
-               /* MSI Interrupt */
-               val = pcie_read(port, XILINX_PCIE_REG_RPIFR1);
+               /* Clear interrupt FIFO register 1 */
+               pcie_write(port, XILINX_PCIE_RPIFR1_ALL_MASK,
+                          XILINX_PCIE_REG_RPIFR1);
 
-               if (!(val & XILINX_PCIE_RPIFR1_INTR_VALID)) {
-                       dev_warn(dev, "RP Intr FIFO1 read error\n");
-                       goto error;
-               }
-
-               if (val & XILINX_PCIE_RPIFR1_MSI_INTR) {
-                       msi_data = pcie_read(port, XILINX_PCIE_REG_RPIFR2) &
-                                  XILINX_PCIE_RPIFR2_MSG_DATA;
-
-                       /* Clear interrupt FIFO register 1 */
-                       pcie_write(port, XILINX_PCIE_RPIFR1_ALL_MASK,
-                                  XILINX_PCIE_REG_RPIFR1);
-
-                       if (IS_ENABLED(CONFIG_PCI_MSI)) {
-                               /* Handle MSI Interrupt */
-                               generic_handle_irq(msi_data);
-                       }
-               }
+               /* Handle the interrupt */
+               if (IS_ENABLED(CONFIG_PCI_MSI) ||
+                   !(val & XILINX_PCIE_RPIFR1_MSI_INTR))
+                       generic_handle_irq(val);
        }
 
        if (status & XILINX_PCIE_INTR_SLV_UNSUPP)