Commit cf7fc3af authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-fixes' 



Michael Chan says:

====================
bnxt_en: Bug fixes.

A collection of 5 miscellaneous bug fixes covering VF anti-spoof setup
issues, devlink MSIX max value, AER, context memory allocation error
path, and VLAN acceleration logic.

Please queue for -stable.  Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c3e302ed c72cb303

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

+13 −7
Original line number Diff line number Diff line
@@ -6642,7 +6642,7 @@ static int bnxt_alloc_ctx_pg_tbls(struct bnxt *bp, 
	int rc;



	if (!mem_size)

		return 0;

		return -EINVAL;



	ctx_pg->nr_pages = DIV_ROUND_UP(mem_size, BNXT_PAGE_SIZE);

	if (ctx_pg->nr_pages > MAX_CTX_TOTAL_PAGES) {
@@ -9780,6 +9780,7 @@ static netdev_features_t bnxt_fix_features(struct net_device *dev, 
					   netdev_features_t features)

{

	struct bnxt *bp = netdev_priv(dev);

	netdev_features_t vlan_features;



	if ((features & NETIF_F_NTUPLE) && !bnxt_rfs_capable(bp))

		features &= ~NETIF_F_NTUPLE;
@@ -9796,12 +9797,14 @@ static netdev_features_t bnxt_fix_features(struct net_device *dev, 
	/* Both CTAG and STAG VLAN accelaration on the RX side have to be

	 * turned on or off together.

	 */

	if ((features & (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)) !=

	    (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)) {

	vlan_features = features & (NETIF_F_HW_VLAN_CTAG_RX |

				    NETIF_F_HW_VLAN_STAG_RX);

	if (vlan_features != (NETIF_F_HW_VLAN_CTAG_RX |

			      NETIF_F_HW_VLAN_STAG_RX)) {

		if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)

			features &= ~(NETIF_F_HW_VLAN_CTAG_RX |

				      NETIF_F_HW_VLAN_STAG_RX);

		else

		else if (vlan_features)

			features |= NETIF_F_HW_VLAN_CTAG_RX |

				    NETIF_F_HW_VLAN_STAG_RX;

	}
@@ -12212,12 +12215,15 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev) 
		bnxt_ulp_start(bp, err);

	}



	if (result != PCI_ERS_RESULT_RECOVERED && netif_running(netdev))

	if (result != PCI_ERS_RESULT_RECOVERED) {

		if (netif_running(netdev))

			dev_close(netdev);

		pci_disable_device(pdev);

	}



	rtnl_unlock();



	return PCI_ERS_RESULT_RECOVERED;

	return result;

}



/**

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

+0 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,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_devlink.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static inline void bnxt_link_bp_to_dl(struct bnxt *bp, struct devlink *dl) 
#define BNXT_NVM_CFG_VER_BITS		24

#define BNXT_NVM_CFG_VER_BYTES		4



#define BNXT_MSIX_VEC_MAX	1280

#define BNXT_MSIX_VEC_MAX	512

#define BNXT_MSIX_VEC_MIN_MAX	128



enum bnxt_nvm_dir_type {

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

+2 −8
Original line number Diff line number Diff line
@@ -85,11 +85,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

	 */
@@ -98,7 +97,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
@@ -228,7 +226,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);
@@ -266,7 +263,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);
@@ -305,7 +301,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);
@@ -477,7 +472,6 @@ static void __bnxt_set_vf_params(struct bnxt *bp, int vf_id) 
	vf = &bp->pf.vf[vf_id];

	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);



	if (is_valid_ether_addr(vf->mac_addr)) {

		req.enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_MAC_ADDR);

CRA Git | Maintained and supported by SUSTech CRA and CCSE