net: ipa: clear disabled IPA interrupt conditions

We ignore any IPA interrupt that has no handler.  If any interrupt
conditions without a handler exist when an IPA interrupt occurs,
clear those conditions.  Add a debug message to report which ones
are being cleared.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrupt.c
index 7dee4ebaf5a95f3e06d2af4502348dd5f316f520..c12d0c33557cd3fbcce9b5d2451ad0a382205468 100644 (file)
--- a/drivers/net/ipa/ipa_interrupt.c
+++ b/drivers/net/ipa/ipa_interrupt.c
@@ -79,6 +79,7 @@ static void ipa_interrupt_process_all(struct ipa_interrupt *interrupt)
 {
        struct ipa *ipa = interrupt->ipa;
        u32 enabled = interrupt->enabled;
+       u32 pending;
        u32 offset;
        u32 mask;
 
@@ -87,8 +88,8 @@ static void ipa_interrupt_process_all(struct ipa_interrupt *interrupt)
         * only the enabled ones.
         */
        offset = ipa_reg_irq_stts_offset(ipa->version);
-       mask = ioread32(ipa->reg_virt + offset);
-       while ((mask &= enabled)) {
+       pending = ioread32(ipa->reg_virt + offset);
+       while ((mask = pending & enabled)) {
                do {
                        u32 irq_id = __ffs(mask);
 
@@ -96,7 +97,17 @@ static void ipa_interrupt_process_all(struct ipa_interrupt *interrupt)
 
                        ipa_interrupt_process(interrupt, irq_id);
                } while (mask);
-               mask = ioread32(ipa->reg_virt + offset);
+               pending = ioread32(ipa->reg_virt + offset);
+       }
+
+       /* If any disabled interrupts are pending, clear them */
+       if (pending) {
+               struct device *dev = &ipa->pdev->dev;
+
+               dev_dbg(dev, "clearing disabled IPA interrupts 0x%08x\n",
+                       pending);
+               offset = ipa_reg_irq_clr_offset(ipa->version);
+               iowrite32(pending, ipa->reg_virt + offset);
        }
 }