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

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

Merge branch 'bnx2x-next' 



Yuval Mintz says:

====================
bnx2x: update FW, rebrand and more

This patch series does several things - it updates the bnx2x FW into
7.12.30 which both contains some small fixes as well as opening the door
for several new features for the device - mainly vxlan/geneve offloads
and vlan filtering offload.
It then adds a new Multi-function mode [BD] which requires this FW in
order to operate.

In addition, this finally rebrands the driver from a 'broadcom' driver
into a 'qlogic' driver [although it would still reside under Broadcom's
tree in the kernel].
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b56ea298 3a375e3c

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

+9 −2
Original line number Diff line number Diff line 
/* bnx2x.h: Broadcom Everest network driver.

/* bnx2x.h: QLogic Everest network driver.

 *

 * Copyright (c) 2007-2013 Broadcom Corporation

 * Copyright (c) 2014 QLogic Corporation

 * All rights reserved

 *

 * 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
@@ -30,7 +32,7 @@ 
 * (you will need to reboot afterwards) */

/* #define BNX2X_STOP_ON_ERROR */



#define DRV_MODULE_VERSION      "1.710.51-0"

#define DRV_MODULE_VERSION      "1.712.30-0"

#define DRV_MODULE_RELDATE      "2014/02/10"

#define BNX2X_BC_VER            0x040200
@@ -1422,6 +1424,7 @@ enum { 
	SUB_MF_MODE_UNKNOWN = 0,

	SUB_MF_MODE_UFP,

	SUB_MF_MODE_NPAR1_DOT_5,

	SUB_MF_MODE_BD,

};



struct bnx2x {
@@ -1636,6 +1639,8 @@ struct bnx2x { 
	u8			mf_sub_mode;

#define IS_MF_UFP(bp)		(IS_MF_SD(bp) && \

				 bp->mf_sub_mode == SUB_MF_MODE_UFP)

#define IS_MF_BD(bp)		(IS_MF_SD(bp) && \

				 bp->mf_sub_mode == SUB_MF_MODE_BD)



	u8			wol;
@@ -2577,6 +2582,8 @@ void bnx2x_set_local_cmng(struct bnx2x *bp); 


void bnx2x_update_mng_version(struct bnx2x *bp);



void bnx2x_update_mfw_dump(struct bnx2x *bp);



#define MCPR_SCRATCH_BASE(bp) \

	(CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH)

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

+86 −7
Original line number Diff line number Diff line 
/* bnx2x_cmn.c: Broadcom Everest network driver.

/* bnx2x_cmn.c: QLogic Everest network driver.

 *

 * Copyright (c) 2007-2013 Broadcom Corporation

 * Copyright (c) 2014 QLogic Corporation

 * All rights reserved

 *

 * 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
@@ -2103,9 +2105,14 @@ int bnx2x_rss(struct bnx2x *bp, struct bnx2x_rss_config_obj *rss_obj, 
		if (rss_obj->udp_rss_v6)

			__set_bit(BNX2X_RSS_IPV6_UDP, &params.rss_flags);



		if (!CHIP_IS_E1x(bp))

		if (!CHIP_IS_E1x(bp)) {

			/* valid only for TUNN_MODE_VXLAN tunnel mode */

			__set_bit(BNX2X_RSS_IPV4_VXLAN, &params.rss_flags);

			__set_bit(BNX2X_RSS_IPV6_VXLAN, &params.rss_flags);



			/* valid only for TUNN_MODE_GRE tunnel mode */

			__set_bit(BNX2X_RSS_GRE_INNER_HDRS, &params.rss_flags);

			__set_bit(BNX2X_RSS_TUNN_INNER_HDRS, &params.rss_flags);

		}

	} else {

		__set_bit(BNX2X_RSS_MODE_DISABLED, &params.rss_flags);

	}
@@ -2510,6 +2517,20 @@ static void bnx2x_bz_fp(struct bnx2x *bp, int index) 
		fp->mode = TPA_MODE_DISABLED;

}



void bnx2x_set_os_driver_state(struct bnx2x *bp, u32 state)

{

	u32 cur;



	if (!IS_MF_BD(bp) || !SHMEM2_HAS(bp, os_driver_state) || IS_VF(bp))

		return;



	cur = SHMEM2_RD(bp, os_driver_state[BP_FW_MB_IDX(bp)]);

	DP(NETIF_MSG_IFUP, "Driver state %08x-->%08x\n",

	   cur, state);



	SHMEM2_WR(bp, os_driver_state[BP_FW_MB_IDX(bp)], state);

}



int bnx2x_load_cnic(struct bnx2x *bp)

{

	int i, rc, port = BP_PORT(bp);
@@ -2873,6 +2894,8 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) 
		/* mark driver is loaded in shmem2 */

		u32 val;

		val = SHMEM2_RD(bp, drv_capabilities_flag[BP_FW_MB_IDX(bp)]);

		val &= ~DRV_FLAGS_MTU_MASK;

		val |= (bp->dev->mtu << DRV_FLAGS_MTU_SHIFT);

		SHMEM2_WR(bp, drv_capabilities_flag[BP_FW_MB_IDX(bp)],

			  val | DRV_FLAGS_CAPABILITIES_LOADED_SUPPORTED |

			  DRV_FLAGS_CAPABILITIES_LOADED_L2);
@@ -2885,10 +2908,17 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) 
		return -EBUSY;

	}



	/* Update driver data for On-Chip MFW dump. */

	if (IS_PF(bp))

		bnx2x_update_mfw_dump(bp);



	/* If PMF - send ADMIN DCBX msg to MFW to initiate DCBX FSM */

	if (bp->port.pmf && (bp->state != BNX2X_STATE_DIAG))

		bnx2x_dcbx_init(bp, false);



	if (!IS_MF_SD_STORAGE_PERSONALITY_ONLY(bp))

		bnx2x_set_os_driver_state(bp, OS_DRIVER_STATE_ACTIVE);



	DP(NETIF_MSG_IFUP, "Ending successfully NIC load\n");



	return 0;
@@ -2956,6 +2986,9 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link) 


	DP(NETIF_MSG_IFUP, "Starting NIC unload\n");



	if (!IS_MF_SD_STORAGE_PERSONALITY_ONLY(bp))

		bnx2x_set_os_driver_state(bp, OS_DRIVER_STATE_DISABLED);



	/* mark driver is unloaded in shmem2 */

	if (IS_PF(bp) && SHMEM2_HAS(bp, drv_capabilities_flag)) {

		u32 val;
@@ -3677,7 +3710,7 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb, 
		pbd2->fw_ip_hdr_to_payload_w =

			hlen_w - ((sizeof(struct ipv6hdr)) >> 1);

		pbd_e2->data.tunnel_data.flags |=

			ETH_TUNNEL_DATA_IP_HDR_TYPE_OUTER;

			ETH_TUNNEL_DATA_IPV6_OUTER;

	}



	pbd2->tcp_send_seq = bswab32(inner_tcp_hdr(skb)->seq);
@@ -4184,6 +4217,41 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	return NETDEV_TX_OK;

}



void bnx2x_get_c2s_mapping(struct bnx2x *bp, u8 *c2s_map, u8 *c2s_default)

{

	int mfw_vn = BP_FW_MB_IDX(bp);

	u32 tmp;



	/* If the shmem shouldn't affect configuration, reflect */

	if (!IS_MF_BD(bp)) {

		int i;



		for (i = 0; i < BNX2X_MAX_PRIORITY; i++)

			c2s_map[i] = i;

		*c2s_default = 0;



		return;

	}



	tmp = SHMEM2_RD(bp, c2s_pcp_map_lower[mfw_vn]);

	tmp = (__force u32)be32_to_cpu((__force __be32)tmp);

	c2s_map[0] = tmp & 0xff;

	c2s_map[1] = (tmp >> 8) & 0xff;

	c2s_map[2] = (tmp >> 16) & 0xff;

	c2s_map[3] = (tmp >> 24) & 0xff;



	tmp = SHMEM2_RD(bp, c2s_pcp_map_upper[mfw_vn]);

	tmp = (__force u32)be32_to_cpu((__force __be32)tmp);

	c2s_map[4] = tmp & 0xff;

	c2s_map[5] = (tmp >> 8) & 0xff;

	c2s_map[6] = (tmp >> 16) & 0xff;

	c2s_map[7] = (tmp >> 24) & 0xff;



	tmp = SHMEM2_RD(bp, c2s_pcp_map_default[mfw_vn]);

	tmp = (__force u32)be32_to_cpu((__force __be32)tmp);

	*c2s_default = (tmp >> (8 * mfw_vn)) & 0xff;

}



/**

 * bnx2x_setup_tc - routine to configure net_device for multi tc

 *
@@ -4194,8 +4262,9 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) 
 */

int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)

{

	int cos, prio, count, offset;

	struct bnx2x *bp = netdev_priv(dev);

	u8 c2s_map[BNX2X_MAX_PRIORITY], c2s_def;

	int cos, prio, count, offset;



	/* setup tc must be called under rtnl lock */

	ASSERT_RTNL();
@@ -4219,12 +4288,16 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc) 
		return -EINVAL;

	}



	bnx2x_get_c2s_mapping(bp, c2s_map, &c2s_def);



	/* configure priority to traffic class mapping */

	for (prio = 0; prio < BNX2X_MAX_PRIORITY; prio++) {

		netdev_set_prio_tc_map(dev, prio, bp->prio_to_cos[prio]);

		int outer_prio = c2s_map[prio];



		netdev_set_prio_tc_map(dev, prio, bp->prio_to_cos[outer_prio]);

		DP(BNX2X_MSG_SP | NETIF_MSG_IFUP,

		   "mapping priority %d to tc %d\n",

		   prio, bp->prio_to_cos[prio]);

		   outer_prio, bp->prio_to_cos[outer_prio]);

	}



	/* Use this configuration to differentiate tc0 from other COSes
@@ -4278,6 +4351,9 @@ int bnx2x_change_mac_addr(struct net_device *dev, void *p) 
	if (netif_running(dev))

		rc = bnx2x_set_eth_mac(bp, true);



	if (IS_PF(bp) && SHMEM2_HAS(bp, curr_cfg))

		SHMEM2_WR(bp, curr_cfg, CURR_CFG_MET_OS);



	return rc;

}
@@ -4831,6 +4907,9 @@ int bnx2x_change_mtu(struct net_device *dev, int new_mtu) 
	 */

	dev->mtu = new_mtu;



	if (IS_PF(bp) && SHMEM2_HAS(bp, curr_cfg))

		SHMEM2_WR(bp, curr_cfg, CURR_CFG_MET_OS);



	return bnx2x_reload_if_running(dev);

}

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

+40 −4
Original line number Diff line number Diff line 
/* bnx2x_cmn.h: Broadcom Everest network driver.

/* bnx2x_cmn.h: QLogic Everest network driver.

 *

 * Copyright (c) 2007-2013 Broadcom Corporation

 * Copyright (c) 2014 QLogic Corporation

 * All rights reserved

 *

 * 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
@@ -620,6 +622,14 @@ int bnx2x_set_features(struct net_device *dev, netdev_features_t features); 
 */

void bnx2x_tx_timeout(struct net_device *dev);



/** bnx2x_get_c2s_mapping - read inner-to-outer vlan configuration

 * c2s_map should have BNX2X_MAX_PRIORITY entries.

 * @bp:			driver handle

 * @c2s_map:		should have BNX2X_MAX_PRIORITY entries for mapping

 * @c2s_default:	entry for non-tagged configuration

 */

void bnx2x_get_c2s_mapping(struct bnx2x *bp, u8 *c2s_map, u8 *c2s_default);



/*********************** Inlines **********************************/

/*********************** Fast path ********************************/

static inline void bnx2x_update_fpsb_idx(struct bnx2x_fastpath *fp)
@@ -931,14 +941,33 @@ static inline int bnx2x_func_start(struct bnx2x *bp) 
	start_params->mf_mode = bp->mf_mode;

	start_params->sd_vlan_tag = bp->mf_ov;



	/* Configure Ethertype for BD mode */

	if (IS_MF_BD(bp)) {

		DP(NETIF_MSG_IFUP, "Configuring ethertype 0x88a8 for BD\n");

		start_params->sd_vlan_eth_type = ETH_P_8021AD;

		REG_WR(bp, PRS_REG_VLAN_TYPE_0, ETH_P_8021AD);

		REG_WR(bp, PBF_REG_VLAN_TYPE_0, ETH_P_8021AD);

		REG_WR(bp, NIG_REG_LLH_E1HOV_TYPE_1, ETH_P_8021AD);



		bnx2x_get_c2s_mapping(bp, start_params->c2s_pri,

				      &start_params->c2s_pri_default);

		start_params->c2s_pri_valid = 1;



		DP(NETIF_MSG_IFUP,

		   "Inner-to-Outer priority: %02x %02x %02x %02x %02x %02x %02x %02x [Default %02x]\n",

		   start_params->c2s_pri[0], start_params->c2s_pri[1],

		   start_params->c2s_pri[2], start_params->c2s_pri[3],

		   start_params->c2s_pri[4], start_params->c2s_pri[5],

		   start_params->c2s_pri[6], start_params->c2s_pri[7],

		   start_params->c2s_pri_default);

	}



	if (CHIP_IS_E2(bp) || CHIP_IS_E3(bp))

		start_params->network_cos_mode = STATIC_COS;

	else /* CHIP_IS_E1X */

		start_params->network_cos_mode = FW_WRR;



	start_params->tunnel_mode	= TUNN_MODE_GRE;

	start_params->gre_tunnel_type	= IPGRE_TUNNEL;

	start_params->inner_gre_rss_en	= 1;

	start_params->inner_rss = 1;



	if (IS_MF_UFP(bp) && BNX2X_IS_MF_SD_PROTOCOL_FCOE(bp)) {

		start_params->class_fail_ethtype = ETH_P_FIP;
@@ -1339,4 +1368,11 @@ void bnx2x_squeeze_objects(struct bnx2x *bp); 
void bnx2x_schedule_sp_rtnl(struct bnx2x*, enum sp_rtnl_flag,

			    u32 verbose);



/**

 * bnx2x_set_os_driver_state - write driver state for management FW usage

 *

 * @bp:		driver handle

 * @state:	OS_DRIVER_STATE_* value reflecting current driver state

 */

void bnx2x_set_os_driver_state(struct bnx2x *bp, u32 state);

#endif /* BNX2X_CMN_H */

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

+8 −4
Original line number Diff line number Diff line 
/* bnx2x_dcb.c: Broadcom Everest network driver.

/* bnx2x_dcb.c: QLogic Everest network driver.

 *

 * Copyright 2009-2013 Broadcom Corporation

 * Copyright 2014 QLogic Corporation

 * All rights reserved

 *

 * Unless you and Broadcom execute a separate written software license

 * Unless you and QLogic execute a separate written software license

 * agreement governing use of this software, this software is licensed to you

 * under the terms of the GNU General Public License version 2, available

 * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").

 *

 * Notwithstanding the above, under no circumstances may you combine this

 * software in any way with any other Broadcom software provided under a

 * license other than the GPL, without Broadcom's express prior written

 * software in any way with any other QLogic software provided under a

 * license other than the GPL, without QLogic's express prior written

 * consent.

 *

 * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
@@ -1850,6 +1852,8 @@ static void bnx2x_dcbx_fw_struct(struct bnx2x *bp, 
			if (bp->dcbx_port_params.ets.cos_params[cos].

						pri_bitmask & pri_bit)

					tt2cos[pri].cos = cos;



		pfc_fw_cfg->dcb_outer_pri[pri]  = ttp[pri];

	}



	/* we never want the FW to add a 0 vlan tag */

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

+6 −4
Original line number Diff line number Diff line 
/* bnx2x_dcb.h: Broadcom Everest network driver.

/* bnx2x_dcb.h: QLogic Everest network driver.

 *

 * Copyright 2009-2013 Broadcom Corporation

 * Copyright 2014 QLogic Corporation

 * All rights reserved

 *

 * Unless you and Broadcom execute a separate written software license

 * Unless you and QLogic execute a separate written software license

 * agreement governing use of this software, this software is licensed to you

 * under the terms of the GNU General Public License version 2, available

 * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").

 *

 * Notwithstanding the above, under no circumstances may you combine this

 * software in any way with any other Broadcom software provided under a

 * license other than the GPL, without Broadcom's express prior written

 * software in any way with any other QLogic software provided under a

 * license other than the GPL, without QLogic's express prior written

 * consent.

 *

 * Maintained by: Ariel Elior <ariel.elior@qlogic.com>