Commit 8ac71327 authored by Mateusz Palczewski's avatar Mateusz Palczewski Committed by Tony Nguyen
Browse files

ice: Fix interface being down after reset with link-down-on-close flag on 



When performing a reset on ice driver with link-down-on-close flag on
interface would always stay down. Fix this by moving a check of this
flag to ice_stop() that is called only when user wants to bring
interface down.

Fixes: ab4ab73f ("ice: Add ethtool private flag to make forcing link down optional")
Signed-off-by: default avatarMateusz Palczewski <mateusz.palczewski@intel.com>
Tested-by: default avatarPetr Oros <poros@redhat.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 122045ca

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

+12 −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;
@@ -8892,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;