net: txgbe: add extra handle for MSI/INTx into thread irq handle

Rename original txgbe_misc_irq_handle() to txgbe_misc_irq_thread_fn()
since it is the handle thread to wake up. And add the primary handler
to deal the case of MSI/INTx, because there is a schedule NAPI poll.

Fixes: aefd013624a1 ("net: txgbe: use irq_domain for interrupt controller")
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
index 1490fd6ddbdf94dd8d14a0713d67a9c5e56689cb..a4cf682dca650e77c4b957c1a94149f4d2409434 100644 (file)
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c
@@ -111,6 +111,36 @@ static const struct irq_domain_ops txgbe_misc_irq_domain_ops = {
 };
 
 static irqreturn_t txgbe_misc_irq_handle(int irq, void *data)
+{
+       struct wx_q_vector *q_vector;
+       struct txgbe *txgbe = data;
+       struct wx *wx = txgbe->wx;
+       u32 eicr;
+
+       if (wx->pdev->msix_enabled)
+               return IRQ_WAKE_THREAD;
+
+       eicr = wx_misc_isb(wx, WX_ISB_VEC0);
+       if (!eicr) {
+               /* shared interrupt alert!
+                * the interrupt that we masked before the ICR read.
+                */
+               if (netif_running(wx->netdev))
+                       txgbe_irq_enable(wx, true);
+               return IRQ_NONE;        /* Not our interrupt */
+       }
+       wx->isb_mem[WX_ISB_VEC0] = 0;
+       if (!(wx->pdev->msi_enabled))
+               wr32(wx, WX_PX_INTA, 1);
+
+       /* would disable interrupts here but it is auto disabled */
+       q_vector = wx->q_vector[0];
+       napi_schedule_irqoff(&q_vector->napi);
+
+       return IRQ_WAKE_THREAD;
+}
+
+static irqreturn_t txgbe_misc_irq_thread_fn(int irq, void *data)
 {
        struct txgbe *txgbe = data;
        struct wx *wx = txgbe->wx;
@@ -157,6 +187,7 @@ void txgbe_free_misc_irq(struct txgbe *txgbe)
 
 int txgbe_setup_misc_irq(struct txgbe *txgbe)
 {
+       unsigned long flags = IRQF_ONESHOT;
        struct wx *wx = txgbe->wx;
        int hwirq, err;
 
@@ -170,14 +201,17 @@ int txgbe_setup_misc_irq(struct txgbe *txgbe)
                irq_create_mapping(txgbe->misc.domain, hwirq);
 
        txgbe->misc.chip = txgbe_irq_chip;
-       if (wx->pdev->msix_enabled)
+       if (wx->pdev->msix_enabled) {
                txgbe->misc.irq = wx->msix_entry->vector;
-       else
+       } else {
                txgbe->misc.irq = wx->pdev->irq;
+               if (!wx->pdev->msi_enabled)
+                       flags |= IRQF_SHARED;
+       }
 
-       err = request_threaded_irq(txgbe->misc.irq, NULL,
-                                  txgbe_misc_irq_handle,
-                                  IRQF_ONESHOT,
+       err = request_threaded_irq(txgbe->misc.irq, txgbe_misc_irq_handle,
+                                  txgbe_misc_irq_thread_fn,
+                                  flags,
                                   wx->netdev->name, txgbe);
        if (err)
                goto del_misc_irq;