bnx2x: Clean previous IGU status before ack

When enabling interrupts, acknowledge the interrupt only
after configuring the IGU to the correct interrupt mode
(otherwise it would dirty selftests)

Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 11 insertions, 7 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index 5409b303a69b..b180a0379003 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1681,7 +1681,6 @@ static int bnx2x_setup_irqs(struct bnx2x *bp)
                 if (rc)
                         return rc;
         } else {
-                bnx2x_ack_int(bp);
                 rc = bnx2x_req_irq(bp);
                 if (rc) {
                         BNX2X_ERR("IRQ request failed  rc %d, aborting\n", rc);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index b4838510f3da..dce452d33c61 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -1539,26 +1539,31 @@ static void bnx2x_igu_int_enable(struct bnx2x *bp)
         if (msix) {
                 val &= ~(IGU_PF_CONF_INT_LINE_EN |
                          IGU_PF_CONF_SINGLE_ISR_EN);
-                val |= (IGU_PF_CONF_FUNC_EN |
-                        IGU_PF_CONF_MSI_MSIX_EN |
+                val |= (IGU_PF_CONF_MSI_MSIX_EN |
                         IGU_PF_CONF_ATTN_BIT_EN);
 
                 if (single_msix)
                         val |= IGU_PF_CONF_SINGLE_ISR_EN;
         } else if (msi) {
                 val &= ~IGU_PF_CONF_INT_LINE_EN;
-                val |= (IGU_PF_CONF_FUNC_EN |
-                        IGU_PF_CONF_MSI_MSIX_EN |
+                val |= (IGU_PF_CONF_MSI_MSIX_EN |
                         IGU_PF_CONF_ATTN_BIT_EN |
                         IGU_PF_CONF_SINGLE_ISR_EN);
         } else {
                 val &= ~IGU_PF_CONF_MSI_MSIX_EN;
-                val |= (IGU_PF_CONF_FUNC_EN |
-                        IGU_PF_CONF_INT_LINE_EN |
+                val |= (IGU_PF_CONF_INT_LINE_EN |
                         IGU_PF_CONF_ATTN_BIT_EN |
                         IGU_PF_CONF_SINGLE_ISR_EN);
         }
 
+        /* Clean previous status - need to configure igu prior to ack*/
+        if ((!msix) || single_msix) {
+                REG_WR(bp, IGU_REG_PF_CONFIGURATION, val);
+                bnx2x_ack_int(bp);
+        }
+
+        val |= IGU_PF_CONF_FUNC_EN;
+
         DP(NETIF_MSG_IFUP, "write 0x%x to IGU  mode %s\n",
            val, (msix ? "MSI-X" : (msi ? "MSI" : "INTx")));