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

Commit 40933af4 authored by Manish Chopra's avatar Manish Chopra Committed by Greg Kroah-Hartman
Browse files

bnx2x: Fix VF's VLAN reconfiguration in reload. 



[ Upstream commit 4a4d2d372fb9b9229327e2ed01d5d9572eddf4de ]

Commit 04f05230c5c13 ("bnx2x: Remove configured vlans as
part of unload sequence."), introduced a regression in driver
that as a part of VF's reload flow, VLANs created on the VF
doesn't get re-configured in hardware as vlan metadata/info
was not getting cleared for the VFs which causes vlan PING to stop.

This patch clears the vlan metadata/info so that VLANs gets
re-configured back in the hardware in VF's reload flow and
PING/traffic continues for VLANs created over the VFs.

Fixes: 04f05230c5c13 ("bnx2x: Remove configured vlans as part of unload sequence.")
Signed-off-by: default avatarManish Chopra <manishc@marvell.com>
Signed-off-by: default avatarSudarsana Kalluru <skalluru@marvell.com>
Signed-off-by: default avatarShahed Shaikh <shshaikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03d54393

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+4 −3
Original line number Diff line number Diff line
@@ -3058,12 +3058,13 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link) 
	/* if VF indicate to PF this function is going down (PF will delete sp

	 * elements and clear initializations

	 */

	if (IS_VF(bp))

	if (IS_VF(bp)) {

		bnx2x_clear_vlan_info(bp);

		bnx2x_vfpf_close_vf(bp);

	else if (unload_mode != UNLOAD_RECOVERY)

	} else if (unload_mode != UNLOAD_RECOVERY) {

		/* if this is a normal/close unload need to clean up chip*/

		bnx2x_chip_cleanup(bp, unload_mode, keep_link);

	else {

	} else {

		/* Send the UNLOAD_REQUEST to the MCP */

		bnx2x_send_unload_req(bp, unload_mode);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

+2 −0
Original line number Diff line number Diff line
@@ -425,6 +425,8 @@ void bnx2x_set_reset_global(struct bnx2x *bp); 
void bnx2x_disable_close_the_gate(struct bnx2x *bp);

int bnx2x_init_hw_func_cnic(struct bnx2x *bp);



void bnx2x_clear_vlan_info(struct bnx2x *bp);



/**

 * bnx2x_sp_event - handle ramrods completion.

 *

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+12 −5
Original line number Diff line number Diff line
@@ -8488,11 +8488,21 @@ int bnx2x_set_vlan_one(struct bnx2x *bp, u16 vlan, 
	return rc;

}



void bnx2x_clear_vlan_info(struct bnx2x *bp)

{

	struct bnx2x_vlan_entry *vlan;



	/* Mark that hw forgot all entries */

	list_for_each_entry(vlan, &bp->vlan_reg, link)

		vlan->hw = false;



	bp->vlan_cnt = 0;

}



static int bnx2x_del_all_vlans(struct bnx2x *bp)

{

	struct bnx2x_vlan_mac_obj *vlan_obj = &bp->sp_objs[0].vlan_obj;

	unsigned long ramrod_flags = 0, vlan_flags = 0;

	struct bnx2x_vlan_entry *vlan;

	int rc;



	__set_bit(RAMROD_COMP_WAIT, &ramrod_flags);
@@ -8501,10 +8511,7 @@ static int bnx2x_del_all_vlans(struct bnx2x *bp) 
	if (rc)

		return rc;



	/* Mark that hw forgot all entries */

	list_for_each_entry(vlan, &bp->vlan_reg, link)

		vlan->hw = false;

	bp->vlan_cnt = 0;

	bnx2x_clear_vlan_info(bp);



	return 0;

}