Commit c193554e authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Update to Firmware interface spec 1.0.0. 



This interface will be forward compatible with future changes.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b72d4a68

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

+16 −17
Original line number Diff line number Diff line
@@ -2787,7 +2787,7 @@ static int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt *bp, u16 vnic_id) 
	struct bnxt_vnic_info *vnic = &bp->vnic_info[vnic_id];



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

	req.dflt_vnic_id = cpu_to_le32(vnic->fw_vnic_id);

	req.vnic_id = cpu_to_le32(vnic->fw_vnic_id);



	req.num_mc_entries = cpu_to_le32(vnic->mc_list_count);

	req.mc_tbl_addr = cpu_to_le64(vnic->mc_list_mapping);
@@ -2820,7 +2820,7 @@ static int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp, 
	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_SRC_PORT_MASK |	\

	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_PORT |		\

	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_PORT_MASK |	\

	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_VNIC_ID)

	 CFA_NTUPLE_FILTER_ALLOC_REQ_ENABLES_DST_ID)



static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp,

					     struct bnxt_ntuple_filter *fltr)
@@ -2839,7 +2839,7 @@ static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp, 


	req.ethertype = htons(ETH_P_IP);

	memcpy(req.src_macaddr, fltr->src_mac_addr, ETH_ALEN);

	req.ipaddr_type = 4;

	req.ip_addr_type = CFA_NTUPLE_FILTER_ALLOC_REQ_IP_ADDR_TYPE_IPV4;

	req.ip_protocol = keys->basic.ip_proto;



	req.src_ipaddr[0] = keys->addrs.v4addrs.src;
@@ -2852,7 +2852,7 @@ static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp, 
	req.dst_port = keys->ports.dst;

	req.dst_port_mask = cpu_to_be16(0xffff);



	req.dst_vnic_id = cpu_to_le16(vnic->fw_vnic_id);

	req.dst_id = cpu_to_le16(vnic->fw_vnic_id);

	mutex_lock(&bp->hwrm_cmd_lock);

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

	if (!rc)
@@ -2872,10 +2872,10 @@ static int bnxt_hwrm_set_vnic_filter(struct bnxt *bp, u16 vnic_id, u16 idx, 
	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_CFA_L2_FILTER_ALLOC, -1, -1);

	req.flags = cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_FLAGS_PATH_RX |

				CFA_L2_FILTER_ALLOC_REQ_FLAGS_OUTERMOST);

	req.dst_vnic_id = cpu_to_le16(bp->vnic_info[vnic_id].fw_vnic_id);

	req.dst_id = cpu_to_le16(bp->vnic_info[vnic_id].fw_vnic_id);

	req.enables =

		cpu_to_le32(CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR |

			    CFA_L2_FILTER_ALLOC_REQ_ENABLES_DST_VNIC_ID |

			    CFA_L2_FILTER_ALLOC_REQ_ENABLES_DST_ID |

			    CFA_L2_FILTER_ALLOC_REQ_ENABLES_L2_ADDR_MASK);

	memcpy(req.l2_addr, mac_addr, ETH_ALEN);

	req.l2_addr_mask[0] = 0xff;
@@ -2945,7 +2945,8 @@ static int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, u16 vnic_id, u32 tpa_flags) 


		req.enables =

			cpu_to_le32(VNIC_TPA_CFG_REQ_ENABLES_MAX_AGG_SEGS |

				    VNIC_TPA_CFG_REQ_ENABLES_MAX_AGGS);

				    VNIC_TPA_CFG_REQ_ENABLES_MAX_AGGS |

				    VNIC_TPA_CFG_REQ_ENABLES_MIN_AGG_LEN);



		/* Number of segs are log2 units, and first packet is not

		 * included as part of this units.
@@ -2963,6 +2964,8 @@ static int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, u16 vnic_id, u32 tpa_flags) 
		segs = ilog2(nsegs);

		req.max_agg_segs = cpu_to_le16(segs);

		req.max_aggs = cpu_to_le16(VNIC_TPA_CFG_REQ_MAX_AGGS_MAX);



		req.min_agg_len = cpu_to_le32(512);

	}

	req.vnic_id = cpu_to_le16(vnic->fw_vnic_id);
@@ -3726,14 +3729,11 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) 


	memcpy(&bp->ver_resp, resp, sizeof(struct hwrm_ver_get_output));



	if (req.hwrm_intf_maj != resp->hwrm_intf_maj ||

	    req.hwrm_intf_min != resp->hwrm_intf_min ||

	    req.hwrm_intf_upd != resp->hwrm_intf_upd) {

		netdev_warn(bp->dev, "HWRM interface %d.%d.%d does not match driver interface %d.%d.%d.\n",

	if (resp->hwrm_intf_maj < 1) {

		netdev_warn(bp->dev, "HWRM interface %d.%d.%d is older than 1.0.0.\n",

			    resp->hwrm_intf_maj, resp->hwrm_intf_min,

			    resp->hwrm_intf_upd, req.hwrm_intf_maj,

			    req.hwrm_intf_min, req.hwrm_intf_upd);

		netdev_warn(bp->dev, "Please update driver or firmware with matching interface versions.\n");

			    resp->hwrm_intf_upd);

		netdev_warn(bp->dev, "Please update firmware with HWRM interface 1.0.0 or newer.\n");

	}

	snprintf(bp->fw_ver_str, BC_HWRM_STR_LEN, "bc %d.%d.%d rm %d.%d.%d",

		 resp->hwrm_fw_maj, resp->hwrm_fw_min, resp->hwrm_fw_bld,
@@ -3936,8 +3936,7 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init) 
	}

	bp->vnic_info[0].uc_filter_count = 1;



	bp->vnic_info[0].rx_mask = CFA_L2_SET_RX_MASK_REQ_MASK_UNICAST |

				   CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;

	bp->vnic_info[0].rx_mask = CFA_L2_SET_RX_MASK_REQ_MASK_BCAST;



	if ((bp->dev->flags & IFF_PROMISC) && BNXT_PF(bp))

		bp->vnic_info[0].rx_mask |=
@@ -4343,7 +4342,7 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state) 
	link_info->auto_mode = resp->auto_mode;

	link_info->auto_pause_setting = resp->auto_pause;

	link_info->force_pause_setting = resp->force_pause;

	link_info->duplex_setting = resp->duplex_setting;

	link_info->duplex_setting = resp->duplex;

	if (link_info->phy_link_status == BNXT_LINK_LINK)

		link_info->link_speed = le16_to_cpu(resp->link_speed);

	else

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

+4 −4
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ 
#define BNXT_H



#define DRV_MODULE_NAME		"bnxt_en"

#define DRV_MODULE_VERSION	"0.1.24"

#define DRV_MODULE_VERSION	"1.0.0"



#define DRV_VER_MAJ	0

#define DRV_VER_MIN	1

#define DRV_VER_UPD	24

#define DRV_VER_MAJ	1

#define DRV_VER_MIN	0

#define DRV_VER_UPD	0



struct tx_bd {

	__le32 tx_bd_len_flags_type;

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

+320 −545

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −6
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ int bnxt_set_vf_spoofchk(struct net_device *dev, int vf_id, bool setting) 
	 * the spoof check should also include vlan anti-spoofing

	 */

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

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

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

	req.flags = cpu_to_le32(func_flags);

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

	if (!rc) {
@@ -128,7 +128,7 @@ 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.vf_id = cpu_to_le16(vf->fw_fid);

	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);
@@ -159,7 +159,7 @@ int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos) 
		return 0;



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

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

	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);
@@ -198,7 +198,7 @@ int bnxt_set_vf_bw(struct net_device *dev, int vf_id, int min_tx_rate, 
	if (min_tx_rate == vf->min_tx_rate && max_tx_rate == vf->max_tx_rate)

		return 0;

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

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

	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);
@@ -421,13 +421,13 @@ static int bnxt_hwrm_func_cfg(struct bnxt *bp, int num_vfs) 


	mutex_lock(&bp->hwrm_cmd_lock);

	for (i = 0; i < num_vfs; i++) {

		req.vf_id = cpu_to_le16(pf->first_vf_id + i);

		req.fid = cpu_to_le16(pf->first_vf_id + i);

		rc = _hwrm_send_message(bp, &req, sizeof(req),

					HWRM_CMD_TIMEOUT);

		if (rc)

			break;

		pf->active_vfs = i + 1;

		pf->vf[i].fw_fid = le16_to_cpu(req.vf_id);

		pf->vf[i].fw_fid = le16_to_cpu(req.fid);

	}

	mutex_unlock(&bp->hwrm_cmd_lock);

	if (!rc) {
@@ -600,6 +600,7 @@ static int bnxt_hwrm_fwd_resp(struct bnxt *bp, struct bnxt_vf_info *vf, 


	/* Set the new target id */

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

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

	req.encap_resp_len = cpu_to_le16(msg_size);

	req.encap_resp_addr = encap_resp_addr;

	req.encap_resp_cmpl_ring = encap_resp_cpr;
@@ -634,6 +635,7 @@ static int bnxt_hwrm_fwd_err_resp(struct bnxt *bp, struct bnxt_vf_info *vf, 
	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_REJECT_FWD_RESP, -1, -1);

	/* Set the new target id */

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

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

	memcpy(req.encap_request, vf->hwrm_cmd_req_addr, msg_size);



	mutex_lock(&bp->hwrm_cmd_lock);
@@ -665,6 +667,7 @@ static int bnxt_hwrm_exec_fwd_resp(struct bnxt *bp, struct bnxt_vf_info *vf, 
	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_EXEC_FWD_RESP, -1, -1);

	/* Set the new target id */

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

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

	memcpy(req.encap_request, vf->hwrm_cmd_req_addr, msg_size);



	mutex_lock(&bp->hwrm_cmd_lock);