net: ipa: enable IPA interrupt handlers separate from registration

Expose ipa_interrupt_enable() and have functions that register
IPA interrupt handlers enable them directly, rather than having the
registration process do that.  Do the same for disabling IPA
interrupt handlers.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrupt.c
index d7b3e6e5cb85d6e1c972cecbea5fc0ca002bd9de..f05ddd496dbe1b988e5e352d89a49e4e3eb42933 100644 (file)
--- a/drivers/net/ipa/ipa_interrupt.c
+++ b/drivers/net/ipa/ipa_interrupt.c
@@ -135,7 +135,7 @@ static void ipa_interrupt_enabled_update(struct ipa *ipa)
 }
 
 /* Enable an IPA interrupt type */
-static void ipa_interrupt_enable(struct ipa *ipa, enum ipa_irq_id ipa_irq)
+void ipa_interrupt_enable(struct ipa *ipa, enum ipa_irq_id ipa_irq)
 {
        /* Update the IPA interrupt mask to enable it */
        ipa->interrupt->enabled |= BIT(ipa_irq);
@@ -143,7 +143,7 @@ static void ipa_interrupt_enable(struct ipa *ipa, enum ipa_irq_id ipa_irq)
 }
 
 /* Disable an IPA interrupt type */
-static void ipa_interrupt_disable(struct ipa *ipa, enum ipa_irq_id ipa_irq)
+void ipa_interrupt_disable(struct ipa *ipa, enum ipa_irq_id ipa_irq)
 {
        /* Update the IPA interrupt mask to disable it */
        ipa->interrupt->enabled &= ~BIT(ipa_irq);
@@ -231,8 +231,6 @@ void ipa_interrupt_add(struct ipa_interrupt *interrupt,
                return;
 
        interrupt->handler[ipa_irq] = handler;
-
-       ipa_interrupt_enable(interrupt->ipa, ipa_irq);
 }
 
 /* Remove the handler for an IPA interrupt type */
@@ -242,8 +240,6 @@ ipa_interrupt_remove(struct ipa_interrupt *interrupt, enum ipa_irq_id ipa_irq)
        if (WARN_ON(ipa_irq >= IPA_IRQ_COUNT))
                return;
 
-       ipa_interrupt_disable(interrupt->ipa, ipa_irq);
-
        interrupt->handler[ipa_irq] = NULL;
 }
 

diff --git a/drivers/net/ipa/ipa_interrupt.h b/drivers/net/ipa/ipa_interrupt.h
index f31fd9965fdc678a38e5f1223d28233a773007e1..90b61e013064bcbdd2c5d7d13758c407bb7ee9d3 100644 (file)
--- a/drivers/net/ipa/ipa_interrupt.h
+++ b/drivers/net/ipa/ipa_interrupt.h
@@ -11,6 +11,7 @@
 
 struct ipa;
 struct ipa_interrupt;
+enum ipa_irq_id;
 
 /**
  * typedef ipa_irq_handler_t - IPA interrupt handler function type
@@ -85,6 +86,20 @@ void ipa_interrupt_suspend_clear_all(struct ipa_interrupt *interrupt);
  */
 void ipa_interrupt_simulate_suspend(struct ipa_interrupt *interrupt);
 
+/**
+ * ipa_interrupt_enable() - Enable an IPA interrupt type
+ * @ipa:       IPA pointer
+ * @ipa_irq:   IPA interrupt ID
+ */
+void ipa_interrupt_enable(struct ipa *ipa, enum ipa_irq_id ipa_irq);
+
+/**
+ * ipa_interrupt_disable() - Disable an IPA interrupt type
+ * @ipa:       IPA pointer
+ * @ipa_irq:   IPA interrupt ID
+ */
+void ipa_interrupt_disable(struct ipa *ipa, enum ipa_irq_id ipa_irq);
+
 /**
  * ipa_interrupt_config() - Configure the IPA interrupt framework
  * @ipa:       IPA pointer

diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c
index 8420f93128a268cce757f93dcaaf6a7979a3c0cd..9148d606d5fc25f61c898bc3fa576d698ec2b745 100644 (file)
--- a/drivers/net/ipa/ipa_power.c
+++ b/drivers/net/ipa/ipa_power.c
@@ -337,10 +337,13 @@ int ipa_power_setup(struct ipa *ipa)
 
        ipa_interrupt_add(ipa->interrupt, IPA_IRQ_TX_SUSPEND,
                          ipa_suspend_handler);
+       ipa_interrupt_enable(ipa, IPA_IRQ_TX_SUSPEND);
 
        ret = device_init_wakeup(&ipa->pdev->dev, true);
-       if (ret)
+       if (ret) {
+               ipa_interrupt_disable(ipa, IPA_IRQ_TX_SUSPEND);
                ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_TX_SUSPEND);
+       }
 
        return ret;
 }
@@ -348,6 +351,7 @@ int ipa_power_setup(struct ipa *ipa)
 void ipa_power_teardown(struct ipa *ipa)
 {
        (void)device_init_wakeup(&ipa->pdev->dev, false);
+       ipa_interrupt_disable(ipa, IPA_IRQ_TX_SUSPEND);
        ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_TX_SUSPEND);
 }
 

diff --git a/drivers/net/ipa/ipa_uc.c b/drivers/net/ipa/ipa_uc.c
index 0a890b44c09e1742c4068df409f0dd0f34b3909b..af541758d047fce15ae969d693e4f8c0a9160ffd 100644 (file)
--- a/drivers/net/ipa/ipa_uc.c
+++ b/drivers/net/ipa/ipa_uc.c
@@ -187,7 +187,9 @@ void ipa_uc_config(struct ipa *ipa)
        ipa->uc_powered = false;
        ipa->uc_loaded = false;
        ipa_interrupt_add(interrupt, IPA_IRQ_UC_0, ipa_uc_interrupt_handler);
+       ipa_interrupt_enable(ipa, IPA_IRQ_UC_0);
        ipa_interrupt_add(interrupt, IPA_IRQ_UC_1, ipa_uc_interrupt_handler);
+       ipa_interrupt_enable(ipa, IPA_IRQ_UC_1);
 }
 
 /* Inverse of ipa_uc_config() */
@@ -195,7 +197,9 @@ void ipa_uc_deconfig(struct ipa *ipa)
 {
        struct device *dev = &ipa->pdev->dev;
 
+       ipa_interrupt_disable(ipa, IPA_IRQ_UC_1);
        ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_1);
+       ipa_interrupt_disable(ipa, IPA_IRQ_UC_0);
        ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_0);
        if (ipa->uc_loaded)
                ipa_power_retention(ipa, false);