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

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

bnxt_en: Update to Firmware 1.2.2 spec. 



Use new field names in API structs and stop using deprecated fields
auto_link_speed and auto_duplex in phy_cfg/phy_qcfg structs.

Update copyright year to 2016.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 04c85bfb

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

+9 −11
Original line number Diff line number Diff line 
/* Broadcom NetXtreme-C/E network driver.

 *

 * Copyright (c) 2014-2015 Broadcom Corporation

 * Copyright (c) 2014-2016 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -2763,7 +2763,7 @@ static int bnxt_hwrm_func_drv_rgtr(struct bnxt *bp) 
	 * only checks if it is non-zero to enable async event forwarding

	 */

	req.async_event_fwd[0] |= cpu_to_le32(1);

	req.os_type = cpu_to_le16(1);

	req.os_type = cpu_to_le16(FUNC_DRV_RGTR_REQ_OS_TYPE_LINUX);

	req.ver_maj = DRV_VER_MAJ;

	req.ver_min = DRV_VER_MIN;

	req.ver_upd = DRV_VER_UPD;
@@ -3726,7 +3726,7 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp) 


		pf->fw_fid = le16_to_cpu(resp->fid);

		pf->port_id = le16_to_cpu(resp->port_id);

		memcpy(pf->mac_addr, resp->perm_mac_address, ETH_ALEN);

		memcpy(pf->mac_addr, resp->mac_address, ETH_ALEN);

		memcpy(bp->dev->dev_addr, pf->mac_addr, ETH_ALEN);

		pf->max_rsscos_ctxs = le16_to_cpu(resp->max_rsscos_ctx);

		pf->max_cp_rings = le16_to_cpu(resp->max_cmpl_rings);
@@ -3751,7 +3751,7 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp) 
		struct bnxt_vf_info *vf = &bp->vf;



		vf->fw_fid = le16_to_cpu(resp->fid);

		memcpy(vf->mac_addr, resp->perm_mac_address, ETH_ALEN);

		memcpy(vf->mac_addr, resp->mac_address, ETH_ALEN);

		if (is_valid_ether_addr(vf->mac_addr))

			/* overwrite netdev dev_adr with admin VF MAC */

			memcpy(bp->dev->dev_addr, vf->mac_addr, ETH_ALEN);
@@ -3842,6 +3842,8 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) 


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



	bp->hwrm_spec_code = resp->hwrm_intf_maj << 16 |

			     resp->hwrm_intf_min << 8 | resp->hwrm_intf_upd;

	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,
@@ -4523,7 +4525,6 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state) 
	else

		link_info->link_speed = 0;

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

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

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

	link_info->auto_link_speeds = le16_to_cpu(resp->auto_link_speed_mask);

	link_info->lp_auto_link_speeds =
@@ -4533,8 +4534,8 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state) 
	link_info->phy_ver[1] = resp->phy_min;

	link_info->phy_ver[2] = resp->phy_bld;

	link_info->media_type = resp->media_type;

	link_info->transceiver = resp->transceiver_type;

	link_info->phy_addr = resp->phy_addr;

	link_info->transceiver = resp->xcvr_pkg_type;

	link_info->phy_addr = resp->eee_config_phy_addr;



	/* TODO: need to add more logic to report VF link */

	if (chng_link_state) {
@@ -4581,7 +4582,7 @@ static void bnxt_hwrm_set_link_common(struct bnxt *bp, 


	if (autoneg & BNXT_AUTONEG_SPEED) {

		req->auto_mode |=

			PORT_PHY_CFG_REQ_AUTO_MODE_MASK;

			PORT_PHY_CFG_REQ_AUTO_MODE_SPEED_MASK;



		req->enables |= cpu_to_le32(

			PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEED_MASK);
@@ -4595,9 +4596,6 @@ static void bnxt_hwrm_set_link_common(struct bnxt *bp, 
		req->flags |= cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_FORCE);

	}



	/* currently don't support half duplex */

	req->auto_duplex = PORT_PHY_CFG_REQ_AUTO_DUPLEX_FULL;

	req->enables |= cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_AUTO_DUPLEX);

	/* tell chimp that the setting takes effect immediately */

	req->flags |= cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_RESET_PHY);

}

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

+4 −4
Original line number Diff line number Diff line 
/* Broadcom NetXtreme-C/E network driver.

 *

 * Copyright (c) 2014-2015 Broadcom Corporation

 * Copyright (c) 2014-2016 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@ 
#define BNXT_H



#define DRV_MODULE_NAME		"bnxt_en"

#define DRV_MODULE_VERSION	"1.0.0"

#define DRV_MODULE_VERSION	"1.2.0"



#define DRV_VER_MAJ	1

#define DRV_VER_MIN	0
@@ -788,7 +788,7 @@ struct bnxt_link_info { 
#define BNXT_LINK_AUTO_ALLSPDS	PORT_PHY_QCFG_RESP_AUTO_MODE_ALL_SPEEDS

#define BNXT_LINK_AUTO_ONESPD	PORT_PHY_QCFG_RESP_AUTO_MODE_ONE_SPEED

#define BNXT_LINK_AUTO_ONEORBELOW PORT_PHY_QCFG_RESP_AUTO_MODE_ONE_OR_BELOW

#define BNXT_LINK_AUTO_MSK	PORT_PHY_QCFG_RESP_AUTO_MODE_MASK

#define BNXT_LINK_AUTO_MSK	PORT_PHY_QCFG_RESP_AUTO_MODE_SPEED_MASK

#define PHY_VER_LEN		3

	u8			phy_ver[PHY_VER_LEN];

	u16			link_speed;
@@ -813,7 +813,6 @@ struct bnxt_link_info { 
#define BNXT_LINK_SPEED_MSK_40GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_40GB

#define BNXT_LINK_SPEED_MSK_50GB PORT_PHY_QCFG_RESP_SUPPORT_SPEEDS_50GB

	u16			lp_auto_link_speeds;

	u16			auto_link_speed;

	u16			force_link_speed;

	u32			preemphasis;
@@ -940,6 +939,7 @@ struct bnxt { 


	u32			msg_enable;



	u32			hwrm_spec_code;

	u16			hwrm_cmd_seq;

	u32			hwrm_intr_seq_id;

	void			*hwrm_cmd_resp_addr;

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

+2 −2
Original line number Diff line number Diff line 
/* Broadcom NetXtreme-C/E network driver.

 *

 * Copyright (c) 2014-2015 Broadcom Corporation

 * Copyright (c) 2014-2016 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -728,7 +728,7 @@ static int bnxt_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	ethtool_speed = bnxt_fw_to_ethtool_speed(link_info->link_speed);

	ethtool_cmd_speed_set(cmd, ethtool_speed);

	if (link_info->transceiver ==

		PORT_PHY_QCFG_RESP_TRANSCEIVER_TYPE_XCVR_INTERNAL)

	    PORT_PHY_QCFG_RESP_XCVR_PKG_TYPE_XCVR_INTERNAL)

		cmd->transceiver = XCVR_INTERNAL;

	else

		cmd->transceiver = XCVR_EXTERNAL;

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

+1 −1
Original line number Diff line number Diff line 
/* Broadcom NetXtreme-C/E network driver.

 *

 * Copyright (c) 2014-2015 Broadcom Corporation

 * Copyright (c) 2014-2016 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

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

+1 −1
Original line number Diff line number Diff line 
/* Broadcom NetXtreme-C/E network driver.

 *

 * Copyright (c) 2014-2015 Broadcom Corporation

 * Copyright (c) 2014-2016 Broadcom Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by