]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
spmi: pmic-arb: check apid enabled before calling the handler
authorAbhijeet Dharmapurikar <adharmap@codeaurora.org>
Wed, 10 May 2017 14:25:39 +0000 (19:55 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Jun 2017 10:05:47 +0000 (19:05 +0900)
The driver currently invokes the apid handler (periph_handler())
once it sees that the summary status bit for that apid is set.

However the hardware is designed to set that bit even if the apid
interrupts are disabled. The driver should check whether the apid
is indeed enabled before calling the apid handler.

Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Signed-off-by: Kiran Gunda <kgunda@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/spmi/spmi-pmic-arb.c

index ad344916493ca580ffdbe695f0964fafe99ce723..f8638faaac9d44678bcc7693f4864346f15cef14 100644 (file)
@@ -536,8 +536,8 @@ static void pmic_arb_chained_irq(struct irq_desc *desc)
        void __iomem *intr = pa->intr;
        int first = pa->min_apid >> 5;
        int last = pa->max_apid >> 5;
-       u32 status;
-       int i, id;
+       u32 status, enable;
+       int i, id, apid;
 
        chained_irq_enter(chip, desc);
 
@@ -547,7 +547,11 @@ static void pmic_arb_chained_irq(struct irq_desc *desc)
                while (status) {
                        id = ffs(status) - 1;
                        status &= ~BIT(id);
-                       periph_interrupt(pa, id + i * 32);
+                       apid = id + i * 32;
+                       enable = readl_relaxed(intr +
+                                       pa->ver_ops->acc_enable(apid));
+                       if (enable & SPMI_PIC_ACC_ENABLE_BIT)
+                               periph_interrupt(pa, apid);
                }
        }