Commit 27392e57 authored by Paweł Jabłoński's avatar Paweł Jabłoński Committed by Jeff Kirsher
Browse files

i40evf: Fix a hardware reset support in VF driver 



This patch fixes a hardware reset support in VF driver.
It is needed because when a hardware reset is detected
adapter->state is in __I40EVF_RESETTING state before
i40evf_reset_task is called. Without this patch
unloading VF driver after a hardware reset ends
with a system crash.

Signed-off-by: default avatarPaweł Jabłoński <pawel.jablonski@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c79756cb

drivers/net/ethernet/intel/i40e/i40e_main.c

+19 −2
Original line number Diff line number Diff line
@@ -2840,6 +2840,23 @@ static int i40e_vlan_rx_add_vid(struct net_device *netdev, 
	return ret;

}



/**

 * i40e_vlan_rx_add_vid_up - Add a vlan id filter to HW offload in UP path

 * @netdev: network interface to be adjusted

 * @proto: unused protocol value

 * @vid: vlan id to be added

 **/

static void i40e_vlan_rx_add_vid_up(struct net_device *netdev,

				    __always_unused __be16 proto, u16 vid)

{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;



	if (vid >= VLAN_N_VID)

		return;

	set_bit(vid, vsi->active_vlans);

}



/**

 * i40e_vlan_rx_kill_vid - Remove a vlan id filter from HW offload

 * @netdev: network interface to be adjusted
@@ -2882,7 +2899,7 @@ static void i40e_restore_vlan(struct i40e_vsi *vsi) 
		i40e_vlan_stripping_disable(vsi);



	for_each_set_bit(vid, vsi->active_vlans, VLAN_N_VID)

		i40e_vlan_rx_add_vid(vsi->netdev, htons(ETH_P_8021Q),

		i40e_vlan_rx_add_vid_up(vsi->netdev, htons(ETH_P_8021Q),

					vid);

}

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+2 −1
Original line number Diff line number Diff line
@@ -1925,7 +1925,8 @@ continue_reset: 
	 * ndo_open() returning, so we can't assume it means all our open

	 * tasks have finished, since we're not holding the rtnl_lock here.

	 */

	running = (adapter->state == __I40EVF_RUNNING);

	running = ((adapter->state == __I40EVF_RUNNING) ||

		   (adapter->state == __I40EVF_RESETTING));



	if (running) {

		netif_carrier_off(netdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE