Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5776cdb authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit 0348c1ab980c1d43fb37b758d4b760990c066cb5 ]

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: 5f490c96 ("S2io: Fixed synchronization between scheduling of napi with card reset and close")
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Link: https://lore.kernel.org/r/20221109023741.131552-1-shaozhengchao@huawei.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 751ceca5

drivers/net/ethernet/neterion/s2io.c

+20 −9
Original line number Diff line number Diff line
@@ -7171,9 +7171,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);
@@ -7211,18 +7210,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;

	}



	S2IO_TIMER_CONF(sp->alarm_timer, s2io_alarm_handle, sp, (HZ/2));
@@ -7241,6 +7238,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;

}



/**