Commit 624aea6b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2022-09-20 (ice)

Michal re-sets TC configuration when changing number of queues.

Mateusz moves the check and call for link-down-on-close to the specific
path for downing/closing the interface.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  ice: Fix interface being down after reset with link-down-on-close flag on
  ice: config netdev tc before setting queues number
====================

Link: https://lore.kernel.org/r/20220920205344.1860934-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 114f398d 8ac71327

drivers/net/ethernet/intel/ice/ice_main.c

+14 −9
Original line number Diff line number Diff line
@@ -6649,7 +6649,7 @@ static void ice_napi_disable_all(struct ice_vsi *vsi) 
 */

int ice_down(struct ice_vsi *vsi)

{

	int i, tx_err, rx_err, link_err = 0, vlan_err = 0;

	int i, tx_err, rx_err, vlan_err = 0;



	WARN_ON(!test_bit(ICE_VSI_DOWN, vsi->state));
@@ -6683,20 +6683,13 @@ int ice_down(struct ice_vsi *vsi) 


	ice_napi_disable_all(vsi);



	if (test_bit(ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA, vsi->back->flags)) {

		link_err = ice_force_phys_link_state(vsi, false);

		if (link_err)

			netdev_err(vsi->netdev, "Failed to set physical link down, VSI %d error %d\n",

				   vsi->vsi_num, link_err);

	}



	ice_for_each_txq(vsi, i)

		ice_clean_tx_ring(vsi->tx_rings[i]);



	ice_for_each_rxq(vsi, i)

		ice_clean_rx_ring(vsi->rx_rings[i]);



	if (tx_err || rx_err || link_err || vlan_err) {

	if (tx_err || rx_err || vlan_err) {

		netdev_err(vsi->netdev, "Failed to close VSI 0x%04X on switch 0x%04X\n",

			   vsi->vsi_num, vsi->vsw->sw_id);

		return -EIO;
@@ -6858,6 +6851,8 @@ int ice_vsi_open(struct ice_vsi *vsi) 
	if (err)

		goto err_setup_rx;



	ice_vsi_cfg_netdev_tc(vsi, vsi->tc_cfg.ena_tc);



	if (vsi->type == ICE_VSI_PF) {

		/* Notify the stack of the actual queue counts. */

		err = netif_set_real_num_tx_queues(vsi->netdev, vsi->num_txq);
@@ -8890,6 +8885,16 @@ int ice_stop(struct net_device *netdev) 
		return -EBUSY;

	}



	if (test_bit(ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA, vsi->back->flags)) {

		int link_err = ice_force_phys_link_state(vsi, false);



		if (link_err) {

			netdev_err(vsi->netdev, "Failed to set physical link down, VSI %d error %d\n",

				   vsi->vsi_num, link_err);

			return -EIO;

		}

	}



	ice_vsi_close(vsi);



	return 0;