net: ipa: only enable the SUSPEND IPA interrupt when needed

Only enable the SUSPEND IPA interrupt type when at least one
endpoint has that interrupt enabled.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrupt.c
index 18036e9cd161f13a0d7643453c90c1407e08b87c..2ef640f9197c79c164025439113de3d05850f5e8 100644 (file)
--- a/drivers/net/ipa/ipa_interrupt.c
+++ b/drivers/net/ipa/ipa_interrupt.c
@@ -196,6 +196,7 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt,
        u32 mask = BIT(endpoint_id % 32);
        u32 unit = endpoint_id / 32;
        const struct reg *reg;
+       unsigned long weight;
        u32 offset;
        u32 val;
 
@@ -205,6 +206,10 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt,
        if (ipa->version == IPA_VERSION_3_0)
                return;
 
+       weight = bitmap_weight(interrupt->suspend_enabled, ipa->endpoint_count);
+       if (weight == 1 && !enable)
+               ipa_interrupt_disable(ipa, IPA_IRQ_TX_SUSPEND);
+
        reg = ipa_reg(ipa, IRQ_SUSPEND_EN);
        offset = reg_n_offset(reg, unit);
        val = ioread32(ipa->reg_virt + offset);
@@ -216,6 +221,9 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt,
        __change_bit(endpoint_id, interrupt->suspend_enabled);
 
        iowrite32(val, ipa->reg_virt + offset);
+
+       if (!weight && enable)
+               ipa_interrupt_enable(ipa, IPA_IRQ_TX_SUSPEND);
 }
 
 /* Enable TX_SUSPEND for an endpoint */

diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c
index 3a7049923c38119ef4c504d22c539ba59845d2be..1a413061472d8a8c3f8af4fbbee5f725439e2559 100644 (file)
--- a/drivers/net/ipa/ipa_power.c
+++ b/drivers/net/ipa/ipa_power.c
@@ -234,21 +234,12 @@ void ipa_power_retention(struct ipa *ipa, bool enable)
 
 int ipa_power_setup(struct ipa *ipa)
 {
-       int ret;
-
-       ipa_interrupt_enable(ipa, IPA_IRQ_TX_SUSPEND);
-
-       ret = device_init_wakeup(ipa->dev, true);
-       if (ret)
-               ipa_interrupt_disable(ipa, IPA_IRQ_TX_SUSPEND);
-
-       return ret;
+       return device_init_wakeup(ipa->dev, true);
 }
 
 void ipa_power_teardown(struct ipa *ipa)
 {
        (void)device_init_wakeup(ipa->dev, false);
-       ipa_interrupt_disable(ipa, IPA_IRQ_TX_SUSPEND);
 }
 
 /* Initialize IPA power management */