PCI: dra7xx: Iterate over INTx status bits

[linux-2.6-block.git] / drivers / pci / dwc / pci-dra7xx.c

diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c
index 4ab113543923c92d9d78e94284b02c4fd65add2c..8bf7c2714db6c6f79b056c10154faf0e93eb6ee6 100644 (file)
--- a/drivers/pci/dwc/pci-dra7xx.c
+++ b/drivers/pci/dwc/pci-dra7xx.c
@@ -226,6 +226,7 @@ static int dra7xx_pcie_intx_map(struct irq_domain *domain, unsigned int irq,
 
 static const struct irq_domain_ops intx_domain_ops = {
        .map = dra7xx_pcie_intx_map,
+       .xlate = pci_irqd_intx_xlate,
 };
 
 static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp)
@@ -256,7 +257,8 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg)
        struct dra7xx_pcie *dra7xx = arg;
        struct dw_pcie *pci = dra7xx->pci;
        struct pcie_port *pp = &pci->pp;
-       u32 reg;
+       unsigned long reg;
+       u32 virq, bit;
 
        reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MSI);
 
@@ -268,8 +270,11 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg)
        case INTB:
        case INTC:
        case INTD:
-               generic_handle_irq(irq_find_mapping(dra7xx->irq_domain,
-                                                   ffs(reg)));
+               for_each_set_bit(bit, &reg, PCI_NUM_INTX) {
+                       virq = irq_find_mapping(dra7xx->irq_domain, bit);
+                       if (virq)
+                               generic_handle_irq(virq);
+               }
                break;
        }