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

Commit 2d79fe56 authored by Michael Chan's avatar Michael Chan Committed by Greg Kroah-Hartman
Browse files

bnxt_en: Fix VF anti-spoof filter setup. 



[ Upstream commit c71c4e49afe173823a2a85b0cabc9b3f1176ffa2 ]

Fix the logic that sets the enable/disable flag for the source MAC
filter according to firmware spec 1.7.1.

In the original firmware spec. before 1.7.1, the VF spoof check flags
were not latched after making the HWRM_FUNC_CFG call, so there was a
need to keep the func_flags so that subsequent calls would perserve
the VF spoof check setting.  A change was made in the 1.7.1 spec
so that the flags became latched.  So we now set or clear the anti-
spoof setting directly without retrieving the old settings in the
stored vf->func_flags which are no longer valid.  We also remove the
unneeded vf->func_flags.

Fixes: 8eb992e8 ("bnxt_en: Update firmware interface spec to 1.7.6.2.")
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 79949e8b

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+0 −1
Original line number Diff line number Diff line
@@ -839,7 +839,6 @@ struct bnxt_vf_info { 
#define BNXT_VF_LINK_FORCED	0x4

#define BNXT_VF_LINK_UP		0x8

#define BNXT_VF_TRUST		0x10

	u32	func_flags; /* func cfg flags */

	u32	min_tx_rate;

	u32	max_tx_rate;

	void	*hwrm_cmd_req_addr;

drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c

+2 −7
Original line number Diff line number Diff line
@@ -99,11 +99,10 @@ int bnxt_set_vf_spoofchk(struct net_device *dev, int vf_id, bool setting) 
	if (old_setting == setting)

		return 0;



	func_flags = vf->func_flags;

	if (setting)

		func_flags |= FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE;

		func_flags = FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE;

	else

		func_flags |= FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE;

		func_flags = FUNC_CFG_REQ_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE;

	/*TODO: if the driver supports VLAN filter on guest VLAN,

	 * the spoof check should also include vlan anti-spoofing

	 */
@@ -112,7 +111,6 @@ int bnxt_set_vf_spoofchk(struct net_device *dev, int vf_id, bool setting) 
	req.flags = cpu_to_le32(func_flags);

	rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);

	if (!rc) {

		vf->func_flags = func_flags;

		if (setting)

			vf->flags |= BNXT_VF_SPOOFCHK;

		else
@@ -197,7 +195,6 @@ int bnxt_set_vf_mac(struct net_device *dev, int vf_id, u8 *mac) 
	memcpy(vf->mac_addr, mac, ETH_ALEN);

	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_CFG, -1, -1);

	req.fid = cpu_to_le16(vf->fw_fid);

	req.flags = cpu_to_le32(vf->func_flags);

	req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_MAC_ADDR);

	memcpy(req.dflt_mac_addr, mac, ETH_ALEN);

	return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
@@ -235,7 +232,6 @@ int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos, 


	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_CFG, -1, -1);

	req.fid = cpu_to_le16(vf->fw_fid);

	req.flags = cpu_to_le32(vf->func_flags);

	req.dflt_vlan = cpu_to_le16(vlan_tag);

	req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_VLAN);

	rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
@@ -274,7 +270,6 @@ int bnxt_set_vf_bw(struct net_device *dev, int vf_id, int min_tx_rate, 
		return 0;

	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_CFG, -1, -1);

	req.fid = cpu_to_le16(vf->fw_fid);

	req.flags = cpu_to_le32(vf->func_flags);

	req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_MAX_BW);

	req.max_bw = cpu_to_le32(max_tx_rate);

	req.enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_MIN_BW);