ethernet: s2io: disable napi when start nic failed in s2io_card_up()

[ Upstream commit 6270e200e620f8217f6081da0cb8379d6a635194 ]

When failed to start nic or add interrupt service routine in
s2io_card_up() for opening device, napi isn't disabled. When open
s2io device next time, it will trigger a BUG_ON()in napi_enable().
Compile tested only.

Fixes: e66a2ac4f99e ("S2io: Fixed synchronization between scheduling of napi with card reset and close")
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Link: https://lore.kernel.org/r/20221109023741.131552-1-shaozhengchao@huawei.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 71ab4e9c9a171f8e2d2fa1b56cc09883b1f14498..69316ddcf067f9332ce9311bbf8f61b6d2952e32 100644 (file)
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -7122,9 +7122,8 @@ static int s2io_card_up(struct s2io_nic *sp)
                if (ret) {
                        DBG_PRINT(ERR_DBG, "%s: Out of memory in Open\n",
                                  dev->name);
-                       s2io_reset(sp);
-                       free_rx_buffers(sp);
-                       return -ENOMEM;
+                       ret = -ENOMEM;
+                       goto err_fill_buff;
                }
                DBG_PRINT(INFO_DBG, "Buf in ring:%d is %d:\n", i,
                          ring->rx_bufs_left);
@@ -7162,18 +7161,16 @@ static int s2io_card_up(struct s2io_nic *sp)
        /* Enable Rx Traffic and interrupts on the NIC */
        if (start_nic(sp)) {
                DBG_PRINT(ERR_DBG, "%s: Starting NIC failed\n", dev->name);
-               s2io_reset(sp);
-               free_rx_buffers(sp);
-               return -ENODEV;
+               ret = -ENODEV;
+               goto err_out;
        }
 
        /* Add interrupt service routine */
        if (s2io_add_isr(sp) != 0) {
                if (sp->config.intr_type == MSI_X)
                        s2io_rem_isr(sp);
-               s2io_reset(sp);
-               free_rx_buffers(sp);
-               return -ENODEV;
+               ret = -ENODEV;
+               goto err_out;
        }
 
        timer_setup(&sp->alarm_timer, s2io_alarm_handle, 0);
@@ -7193,6 +7190,20 @@ static int s2io_card_up(struct s2io_nic *sp)
        }
 
        return 0;
+
+err_out:
+       if (config->napi) {
+               if (config->intr_type == MSI_X) {
+                       for (i = 0; i < sp->config.rx_ring_num; i++)
+                               napi_disable(&sp->mac_control.rings[i].napi);
+               } else {
+                       napi_disable(&sp->napi);
+               }
+       }
+err_fill_buff:
+       s2io_reset(sp);
+       free_rx_buffers(sp);
+       return ret;
 }
 
 /**