bnx2x: Utilize FW 7.10.51 (e42780b6) · Commits · 戴 / test

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

+33 −32

Original line number	Original line	Diff line number	Diff line
	@@ -2082,6 +2082,10 @@ int bnx2x_rss(struct bnx2x bp, struct bnx2x_rss_config_obj rss_obj,
	__set_bit(BNX2X_RSS_IPV4_UDP, &params.rss_flags);		__set_bit(BNX2X_RSS_IPV4_UDP, &params.rss_flags);
	if (rss_obj->udp_rss_v6)		if (rss_obj->udp_rss_v6)
	__set_bit(BNX2X_RSS_IPV6_UDP, &params.rss_flags);		__set_bit(BNX2X_RSS_IPV6_UDP, &params.rss_flags);

			if (!CHIP_IS_E1x(bp))
			/* valid only for TUNN_MODE_GRE tunnel mode */
			__set_bit(BNX2X_RSS_GRE_INNER_HDRS, &params.rss_flags);
	} else {		} else {
	__set_bit(BNX2X_RSS_MODE_DISABLED, &params.rss_flags);		__set_bit(BNX2X_RSS_MODE_DISABLED, &params.rss_flags);
	}		}
	@@ -3441,26 +3445,6 @@ exit_lbl:
	}		}
	#endif		#endif

	static void bnx2x_set_pbd_gso_e2(struct sk_buff skb, u32 parsing_data,
	u32 xmit_type)
	{
	struct ipv6hdr *ipv6;

	*parsing_data \|= (skb_shinfo(skb)->gso_size <<
	ETH_TX_PARSE_BD_E2_LSO_MSS_SHIFT) &
	ETH_TX_PARSE_BD_E2_LSO_MSS;

	if (xmit_type & XMIT_GSO_ENC_V6)
	ipv6 = inner_ipv6_hdr(skb);
	else if (xmit_type & XMIT_GSO_V6)
	ipv6 = ipv6_hdr(skb);
	else
	ipv6 = NULL;

	if (ipv6 && ipv6->nexthdr == NEXTHDR_IPV6)
	*parsing_data \|= ETH_TX_PARSE_BD_E2_IPV6_WITH_EXT_HDR;
	}

	/**		/**
	* bnx2x_set_pbd_gso - update PBD in GSO case.		* bnx2x_set_pbd_gso - update PBD in GSO case.
	*		*
	@@ -3470,7 +3454,6 @@ static void bnx2x_set_pbd_gso_e2(struct sk_buff skb, u32 parsing_data,
	*/		*/
	static void bnx2x_set_pbd_gso(struct sk_buff *skb,		static void bnx2x_set_pbd_gso(struct sk_buff *skb,
	struct eth_tx_parse_bd_e1x *pbd,		struct eth_tx_parse_bd_e1x *pbd,
	struct eth_tx_start_bd *tx_start_bd,
	u32 xmit_type)		u32 xmit_type)
	{		{
	pbd->lso_mss = cpu_to_le16(skb_shinfo(skb)->gso_size);		pbd->lso_mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
	@@ -3483,9 +3466,6 @@ static void bnx2x_set_pbd_gso(struct sk_buff *skb,
	bswab16(~csum_tcpudp_magic(ip_hdr(skb)->saddr,		bswab16(~csum_tcpudp_magic(ip_hdr(skb)->saddr,
	ip_hdr(skb)->daddr,		ip_hdr(skb)->daddr,
	0, IPPROTO_TCP, 0));		0, IPPROTO_TCP, 0));

	/* GSO on 57710/57711 needs FW to calculate IP checksum */
	tx_start_bd->bd_flags.as_bitfield \|= ETH_TX_BD_FLAGS_IP_CSUM;
	} else {		} else {
	pbd->tcp_pseudo_csum =		pbd->tcp_pseudo_csum =
	bswab16(~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,		bswab16(~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
	@@ -3657,18 +3637,23 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb,
	(__force u32)iph->tot_len -		(__force u32)iph->tot_len -
	(__force u32)iph->frag_off;		(__force u32)iph->frag_off;

			outerip_len = iph->ihl << 1;

	pbd2->fw_ip_csum_wo_len_flags_frag =		pbd2->fw_ip_csum_wo_len_flags_frag =
	bswab16(csum_fold((__force __wsum)csum));		bswab16(csum_fold((__force __wsum)csum));
	} else {		} else {
	pbd2->fw_ip_hdr_to_payload_w =		pbd2->fw_ip_hdr_to_payload_w =
	hlen_w - ((sizeof(struct ipv6hdr)) >> 1);		hlen_w - ((sizeof(struct ipv6hdr)) >> 1);
			pbd_e2->data.tunnel_data.flags \|=
			1 /IPv6/ << ETH_TUNNEL_DATA_IP_HDR_TYPE_OUTER;
	}		}

	pbd2->tcp_send_seq = bswab32(inner_tcp_hdr(skb)->seq);		pbd2->tcp_send_seq = bswab32(inner_tcp_hdr(skb)->seq);

	pbd2->tcp_flags = pbd_tcp_flags(inner_tcp_hdr(skb));		pbd2->tcp_flags = pbd_tcp_flags(inner_tcp_hdr(skb));

	if (xmit_type & XMIT_GSO_V4) {		/* inner IP header info */
			if (xmit_type & XMIT_CSUM_ENC_V4) {
	pbd2->hw_ip_id = bswab16(inner_ip_hdr(skb)->id);		pbd2->hw_ip_id = bswab16(inner_ip_hdr(skb)->id);

	pbd_e2->data.tunnel_data.pseudo_csum =		pbd_e2->data.tunnel_data.pseudo_csum =
	@@ -3676,8 +3661,6 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb,
	inner_ip_hdr(skb)->saddr,		inner_ip_hdr(skb)->saddr,
	inner_ip_hdr(skb)->daddr,		inner_ip_hdr(skb)->daddr,
	0, IPPROTO_TCP, 0));		0, IPPROTO_TCP, 0));

	outerip_len = ip_hdr(skb)->ihl << 1;
	} else {		} else {
	pbd_e2->data.tunnel_data.pseudo_csum =		pbd_e2->data.tunnel_data.pseudo_csum =
	bswab16(~csum_ipv6_magic(		bswab16(~csum_ipv6_magic(
	@@ -3690,8 +3673,6 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb,

	*global_data \|=		*global_data \|=
	outerip_off \|		outerip_off \|
	(!!(xmit_type & XMIT_CSUM_V6) <<
	ETH_TX_PARSE_2ND_BD_IP_HDR_TYPE_OUTER_SHIFT) \|
	(outerip_len <<		(outerip_len <<
	ETH_TX_PARSE_2ND_BD_IP_HDR_LEN_OUTER_W_SHIFT) \|		ETH_TX_PARSE_2ND_BD_IP_HDR_LEN_OUTER_W_SHIFT) \|
	((skb->protocol == cpu_to_be16(ETH_P_8021Q)) <<		((skb->protocol == cpu_to_be16(ETH_P_8021Q)) <<
	@@ -3703,6 +3684,23 @@ static void bnx2x_update_pbds_gso_enc(struct sk_buff *skb,
	}		}
	}		}

			static inline void bnx2x_set_ipv6_ext_e2(struct sk_buff skb, u32 parsing_data,
			u32 xmit_type)
			{
			struct ipv6hdr *ipv6;

			if (!(xmit_type & (XMIT_GSO_ENC_V6 \| XMIT_GSO_V6)))
			return;

			if (xmit_type & XMIT_GSO_ENC_V6)
			ipv6 = inner_ipv6_hdr(skb);
			else /* XMIT_GSO_V6 */
			ipv6 = ipv6_hdr(skb);

			if (ipv6->nexthdr == NEXTHDR_IPV6)
			*parsing_data \|= ETH_TX_PARSE_BD_E2_IPV6_WITH_EXT_HDR;
			}

	/* called with netif_tx_lock		/* called with netif_tx_lock
	* bnx2x_tx_int() runs without netif_tx_lock unless it needs to call		* bnx2x_tx_int() runs without netif_tx_lock unless it needs to call
	* netif_wake_queue()		* netif_wake_queue()
	@@ -3919,6 +3917,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff skb, struct net_device dev)
	xmit_type);		xmit_type);
	}		}

			bnx2x_set_ipv6_ext_e2(skb, &pbd_e2_parsing_data, xmit_type);
	/* Add the macs to the parsing BD if this is a vf or if		/* Add the macs to the parsing BD if this is a vf or if
	* Tx Switching is enabled.		* Tx Switching is enabled.
	*/		*/
	@@ -3984,10 +3983,12 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff skb, struct net_device dev)
	bd_prod);		bd_prod);
	}		}
	if (!CHIP_IS_E1x(bp))		if (!CHIP_IS_E1x(bp))
	bnx2x_set_pbd_gso_e2(skb, &pbd_e2_parsing_data,		pbd_e2_parsing_data \|=
	xmit_type);		(skb_shinfo(skb)->gso_size <<
			ETH_TX_PARSE_BD_E2_LSO_MSS_SHIFT) &
			ETH_TX_PARSE_BD_E2_LSO_MSS;
	else		else
	bnx2x_set_pbd_gso(skb, pbd_e1x, first_bd, xmit_type);		bnx2x_set_pbd_gso(skb, pbd_e1x, xmit_type);
	}		}

	/* Set the PBD's parsing_data field if not zero		/* Set the PBD's parsing_data field if not zero

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -932,8 +932,9 @@ static inline int bnx2x_func_start(struct bnx2x *bp)
	else /* CHIP_IS_E1X */		else /* CHIP_IS_E1X */
	start_params->network_cos_mode = FW_WRR;		start_params->network_cos_mode = FW_WRR;

	start_params->gre_tunnel_mode = L2GRE_TUNNEL;		start_params->tunnel_mode = TUNN_MODE_GRE;
	start_params->gre_tunnel_rss = GRE_INNER_HEADERS_RSS;		start_params->gre_tunnel_type = IPGRE_TUNNEL;
			start_params->inner_gre_rss_en = 1;

	return bnx2x_func_state_change(bp, &func_params);		return bnx2x_func_state_change(bp, &func_params);
	}		}

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

+113 −109

Original line number	Original line	Diff line number	Diff line
	@@ -10,170 +10,170 @@
	#ifndef BNX2X_FW_DEFS_H		#ifndef BNX2X_FW_DEFS_H
	#define BNX2X_FW_DEFS_H		#define BNX2X_FW_DEFS_H

	#define CSTORM_ASSERT_LIST_INDEX_OFFSET (IRO[148].base)		#define CSTORM_ASSERT_LIST_INDEX_OFFSET (IRO[152].base)
	#define CSTORM_ASSERT_LIST_OFFSET(assertListEntry) \		#define CSTORM_ASSERT_LIST_OFFSET(assertListEntry) \
	(IRO[147].base + ((assertListEntry) * IRO[147].m1))		(IRO[151].base + ((assertListEntry) * IRO[151].m1))
	#define CSTORM_EVENT_RING_DATA_OFFSET(pfId) \		#define CSTORM_EVENT_RING_DATA_OFFSET(pfId) \
	(IRO[153].base + (((pfId)>>1) * IRO[153].m1) + (((pfId)&1) * \		(IRO[157].base + (((pfId)>>1) * IRO[157].m1) + (((pfId)&1) * \
	IRO[153].m2))		IRO[157].m2))
	#define CSTORM_EVENT_RING_PROD_OFFSET(pfId) \		#define CSTORM_EVENT_RING_PROD_OFFSET(pfId) \
	(IRO[154].base + (((pfId)>>1) * IRO[154].m1) + (((pfId)&1) * \		(IRO[158].base + (((pfId)>>1) * IRO[158].m1) + (((pfId)&1) * \
	IRO[154].m2))		IRO[158].m2))
	#define CSTORM_FINAL_CLEANUP_COMPLETE_OFFSET(funcId) \		#define CSTORM_FINAL_CLEANUP_COMPLETE_OFFSET(funcId) \
	(IRO[159].base + ((funcId) * IRO[159].m1))		(IRO[163].base + ((funcId) * IRO[163].m1))
	#define CSTORM_FUNC_EN_OFFSET(funcId) \		#define CSTORM_FUNC_EN_OFFSET(funcId) \
	(IRO[149].base + ((funcId) * IRO[149].m1))		(IRO[153].base + ((funcId) * IRO[153].m1))
	#define CSTORM_HC_SYNC_LINE_INDEX_E1X_OFFSET(hcIndex, sbId) \		#define CSTORM_HC_SYNC_LINE_INDEX_E1X_OFFSET(hcIndex, sbId) \
	(IRO[139].base + ((hcIndex) * IRO[139].m1) + ((sbId) * IRO[139].m2))		(IRO[143].base + ((hcIndex) * IRO[143].m1) + ((sbId) * IRO[143].m2))
	#define CSTORM_HC_SYNC_LINE_INDEX_E2_OFFSET(hcIndex, sbId) \		#define CSTORM_HC_SYNC_LINE_INDEX_E2_OFFSET(hcIndex, sbId) \
	(IRO[138].base + (((hcIndex)>>2) * IRO[138].m1) + (((hcIndex)&3) \		(IRO[142].base + (((hcIndex)>>2) * IRO[142].m1) + (((hcIndex)&3) \
	* IRO[138].m2) + ((sbId) * IRO[138].m3))		* IRO[142].m2) + ((sbId) * IRO[142].m3))
	#define CSTORM_IGU_MODE_OFFSET (IRO[157].base)		#define CSTORM_IGU_MODE_OFFSET (IRO[161].base)
	#define CSTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \		#define CSTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
	(IRO[317].base + ((pfId) * IRO[317].m1))		(IRO[323].base + ((pfId) * IRO[323].m1))
	#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \		#define CSTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
	(IRO[318].base + ((pfId) * IRO[318].m1))		(IRO[324].base + ((pfId) * IRO[324].m1))
	#define CSTORM_ISCSI_EQ_CONS_OFFSET(pfId, iscsiEqId) \		#define CSTORM_ISCSI_EQ_CONS_OFFSET(pfId, iscsiEqId) \
	(IRO[310].base + ((pfId) * IRO[310].m1) + ((iscsiEqId) * IRO[310].m2))		(IRO[316].base + ((pfId) * IRO[316].m1) + ((iscsiEqId) * IRO[316].m2))
	#define CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(pfId, iscsiEqId) \		#define CSTORM_ISCSI_EQ_NEXT_EQE_ADDR_OFFSET(pfId, iscsiEqId) \
	(IRO[312].base + ((pfId) * IRO[312].m1) + ((iscsiEqId) * IRO[312].m2))		(IRO[318].base + ((pfId) * IRO[318].m1) + ((iscsiEqId) * IRO[318].m2))
	#define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(pfId, iscsiEqId) \		#define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_OFFSET(pfId, iscsiEqId) \
	(IRO[311].base + ((pfId) * IRO[311].m1) + ((iscsiEqId) * IRO[311].m2))		(IRO[317].base + ((pfId) * IRO[317].m1) + ((iscsiEqId) * IRO[317].m2))
	#define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_VALID_OFFSET(pfId, iscsiEqId) \		#define CSTORM_ISCSI_EQ_NEXT_PAGE_ADDR_VALID_OFFSET(pfId, iscsiEqId) \
	(IRO[313].base + ((pfId) * IRO[313].m1) + ((iscsiEqId) * IRO[313].m2))		(IRO[319].base + ((pfId) * IRO[319].m1) + ((iscsiEqId) * IRO[319].m2))
	#define CSTORM_ISCSI_EQ_PROD_OFFSET(pfId, iscsiEqId) \		#define CSTORM_ISCSI_EQ_PROD_OFFSET(pfId, iscsiEqId) \
	(IRO[309].base + ((pfId) * IRO[309].m1) + ((iscsiEqId) * IRO[309].m2))
	#define CSTORM_ISCSI_EQ_SB_INDEX_OFFSET(pfId, iscsiEqId) \
	(IRO[315].base + ((pfId) * IRO[315].m1) + ((iscsiEqId) * IRO[315].m2))		(IRO[315].base + ((pfId) * IRO[315].m1) + ((iscsiEqId) * IRO[315].m2))
			#define CSTORM_ISCSI_EQ_SB_INDEX_OFFSET(pfId, iscsiEqId) \
			(IRO[321].base + ((pfId) * IRO[321].m1) + ((iscsiEqId) * IRO[321].m2))
	#define CSTORM_ISCSI_EQ_SB_NUM_OFFSET(pfId, iscsiEqId) \		#define CSTORM_ISCSI_EQ_SB_NUM_OFFSET(pfId, iscsiEqId) \
	(IRO[314].base + ((pfId) * IRO[314].m1) + ((iscsiEqId) * IRO[314].m2))		(IRO[320].base + ((pfId) * IRO[320].m1) + ((iscsiEqId) * IRO[320].m2))
	#define CSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \		#define CSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
	(IRO[316].base + ((pfId) * IRO[316].m1))		(IRO[322].base + ((pfId) * IRO[322].m1))
	#define CSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \		#define CSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
	(IRO[308].base + ((pfId) * IRO[308].m1))		(IRO[314].base + ((pfId) * IRO[314].m1))
	#define CSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \		#define CSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
	(IRO[307].base + ((pfId) * IRO[307].m1))		(IRO[313].base + ((pfId) * IRO[313].m1))
	#define CSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \		#define CSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
	(IRO[306].base + ((pfId) * IRO[306].m1))		(IRO[312].base + ((pfId) * IRO[312].m1))
	#define CSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \		#define CSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
	(IRO[151].base + ((funcId) * IRO[151].m1))		(IRO[155].base + ((funcId) * IRO[155].m1))
	#define CSTORM_SP_STATUS_BLOCK_DATA_OFFSET(pfId) \		#define CSTORM_SP_STATUS_BLOCK_DATA_OFFSET(pfId) \
	(IRO[142].base + ((pfId) * IRO[142].m1))		(IRO[146].base + ((pfId) * IRO[146].m1))
	#define CSTORM_SP_STATUS_BLOCK_DATA_STATE_OFFSET(pfId) \		#define CSTORM_SP_STATUS_BLOCK_DATA_STATE_OFFSET(pfId) \
	(IRO[143].base + ((pfId) * IRO[143].m1))		(IRO[147].base + ((pfId) * IRO[147].m1))
	#define CSTORM_SP_STATUS_BLOCK_OFFSET(pfId) \		#define CSTORM_SP_STATUS_BLOCK_OFFSET(pfId) \
	(IRO[141].base + ((pfId) * IRO[141].m1))		(IRO[145].base + ((pfId) * IRO[145].m1))
	#define CSTORM_SP_STATUS_BLOCK_SIZE (IRO[141].size)		#define CSTORM_SP_STATUS_BLOCK_SIZE (IRO[145].size)
	#define CSTORM_SP_SYNC_BLOCK_OFFSET(pfId) \		#define CSTORM_SP_SYNC_BLOCK_OFFSET(pfId) \
	(IRO[144].base + ((pfId) * IRO[144].m1))		(IRO[148].base + ((pfId) * IRO[148].m1))
	#define CSTORM_SP_SYNC_BLOCK_SIZE (IRO[144].size)		#define CSTORM_SP_SYNC_BLOCK_SIZE (IRO[148].size)
	#define CSTORM_STATUS_BLOCK_DATA_FLAGS_OFFSET(sbId, hcIndex) \		#define CSTORM_STATUS_BLOCK_DATA_FLAGS_OFFSET(sbId, hcIndex) \
	(IRO[136].base + ((sbId) * IRO[136].m1) + ((hcIndex) * IRO[136].m2))		(IRO[140].base + ((sbId) * IRO[140].m1) + ((hcIndex) * IRO[140].m2))
	#define CSTORM_STATUS_BLOCK_DATA_OFFSET(sbId) \		#define CSTORM_STATUS_BLOCK_DATA_OFFSET(sbId) \
	(IRO[133].base + ((sbId) * IRO[133].m1))		(IRO[137].base + ((sbId) * IRO[137].m1))
	#define CSTORM_STATUS_BLOCK_DATA_STATE_OFFSET(sbId) \		#define CSTORM_STATUS_BLOCK_DATA_STATE_OFFSET(sbId) \
	(IRO[134].base + ((sbId) * IRO[134].m1))		(IRO[138].base + ((sbId) * IRO[138].m1))
	#define CSTORM_STATUS_BLOCK_DATA_TIMEOUT_OFFSET(sbId, hcIndex) \		#define CSTORM_STATUS_BLOCK_DATA_TIMEOUT_OFFSET(sbId, hcIndex) \
	(IRO[135].base + ((sbId) * IRO[135].m1) + ((hcIndex) * IRO[135].m2))		(IRO[139].base + ((sbId) * IRO[139].m1) + ((hcIndex) * IRO[139].m2))
	#define CSTORM_STATUS_BLOCK_OFFSET(sbId) \		#define CSTORM_STATUS_BLOCK_OFFSET(sbId) \
	(IRO[132].base + ((sbId) * IRO[132].m1))		(IRO[136].base + ((sbId) * IRO[136].m1))
	#define CSTORM_STATUS_BLOCK_SIZE (IRO[132].size)		#define CSTORM_STATUS_BLOCK_SIZE (IRO[136].size)
	#define CSTORM_SYNC_BLOCK_OFFSET(sbId) \		#define CSTORM_SYNC_BLOCK_OFFSET(sbId) \
	(IRO[137].base + ((sbId) * IRO[137].m1))		(IRO[141].base + ((sbId) * IRO[141].m1))
	#define CSTORM_SYNC_BLOCK_SIZE (IRO[137].size)		#define CSTORM_SYNC_BLOCK_SIZE (IRO[141].size)
	#define CSTORM_VF_PF_CHANNEL_STATE_OFFSET(vfId) \		#define CSTORM_VF_PF_CHANNEL_STATE_OFFSET(vfId) \
	(IRO[155].base + ((vfId) * IRO[155].m1))		(IRO[159].base + ((vfId) * IRO[159].m1))
	#define CSTORM_VF_PF_CHANNEL_VALID_OFFSET(vfId) \		#define CSTORM_VF_PF_CHANNEL_VALID_OFFSET(vfId) \
	(IRO[156].base + ((vfId) * IRO[156].m1))		(IRO[160].base + ((vfId) * IRO[160].m1))
	#define CSTORM_VF_TO_PF_OFFSET(funcId) \		#define CSTORM_VF_TO_PF_OFFSET(funcId) \
	(IRO[150].base + ((funcId) * IRO[150].m1))		(IRO[154].base + ((funcId) * IRO[154].m1))
	#define TSTORM_APPROXIMATE_MATCH_MULTICAST_FILTERING_OFFSET(pfId) \		#define TSTORM_APPROXIMATE_MATCH_MULTICAST_FILTERING_OFFSET(pfId) \
	(IRO[203].base + ((pfId) * IRO[203].m1))		(IRO[207].base + ((pfId) * IRO[207].m1))
	#define TSTORM_ASSERT_LIST_INDEX_OFFSET (IRO[102].base)		#define TSTORM_ASSERT_LIST_INDEX_OFFSET (IRO[102].base)
	#define TSTORM_ASSERT_LIST_OFFSET(assertListEntry) \		#define TSTORM_ASSERT_LIST_OFFSET(assertListEntry) \
	(IRO[101].base + ((assertListEntry) * IRO[101].m1))		(IRO[101].base + ((assertListEntry) * IRO[101].m1))
	#define TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(pfId) \		#define TSTORM_FUNCTION_COMMON_CONFIG_OFFSET(pfId) \
	(IRO[201].base + ((pfId) * IRO[201].m1))		(IRO[205].base + ((pfId) * IRO[205].m1))
	#define TSTORM_FUNC_EN_OFFSET(funcId) \		#define TSTORM_FUNC_EN_OFFSET(funcId) \
	(IRO[103].base + ((funcId) * IRO[103].m1))		(IRO[107].base + ((funcId) * IRO[107].m1))
	#define TSTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \		#define TSTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \
	(IRO[272].base + ((pfId) * IRO[272].m1))		(IRO[278].base + ((pfId) * IRO[278].m1))
	#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \		#define TSTORM_ISCSI_L2_ISCSI_OOO_CID_TABLE_OFFSET(pfId) \
	(IRO[273].base + ((pfId) * IRO[273].m1))		(IRO[279].base + ((pfId) * IRO[279].m1))
	#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \		#define TSTORM_ISCSI_L2_ISCSI_OOO_CLIENT_ID_TABLE_OFFSET(pfId) \
	(IRO[274].base + ((pfId) * IRO[274].m1))		(IRO[280].base + ((pfId) * IRO[280].m1))
	#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \		#define TSTORM_ISCSI_L2_ISCSI_OOO_PROD_OFFSET(pfId) \
	(IRO[275].base + ((pfId) * IRO[275].m1))		(IRO[281].base + ((pfId) * IRO[281].m1))
	#define TSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \		#define TSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
	(IRO[271].base + ((pfId) * IRO[271].m1))		(IRO[277].base + ((pfId) * IRO[277].m1))
	#define TSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \		#define TSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
	(IRO[270].base + ((pfId) * IRO[270].m1))		(IRO[276].base + ((pfId) * IRO[276].m1))
	#define TSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \		#define TSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
	(IRO[269].base + ((pfId) * IRO[269].m1))		(IRO[275].base + ((pfId) * IRO[275].m1))
	#define TSTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \		#define TSTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
	(IRO[268].base + ((pfId) * IRO[268].m1))		(IRO[274].base + ((pfId) * IRO[274].m1))
	#define TSTORM_ISCSI_TCP_LOCAL_ADV_WND_OFFSET(pfId) \		#define TSTORM_ISCSI_TCP_LOCAL_ADV_WND_OFFSET(pfId) \
	(IRO[278].base + ((pfId) * IRO[278].m1))		(IRO[284].base + ((pfId) * IRO[284].m1))
	#define TSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \		#define TSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
	(IRO[264].base + ((pfId) * IRO[264].m1))		(IRO[270].base + ((pfId) * IRO[270].m1))
	#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \		#define TSTORM_ISCSI_TCP_VARS_LSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
	(IRO[265].base + ((pfId) * IRO[265].m1))		(IRO[271].base + ((pfId) * IRO[271].m1))
	#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \		#define TSTORM_ISCSI_TCP_VARS_MID_LOCAL_MAC_ADDR_OFFSET(pfId) \
	(IRO[266].base + ((pfId) * IRO[266].m1))		(IRO[272].base + ((pfId) * IRO[272].m1))
	#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \		#define TSTORM_ISCSI_TCP_VARS_MSB_LOCAL_MAC_ADDR_OFFSET(pfId) \
	(IRO[267].base + ((pfId) * IRO[267].m1))		(IRO[273].base + ((pfId) * IRO[273].m1))
	#define TSTORM_MAC_FILTER_CONFIG_OFFSET(pfId) \		#define TSTORM_MAC_FILTER_CONFIG_OFFSET(pfId) \
	(IRO[202].base + ((pfId) * IRO[202].m1))		(IRO[206].base + ((pfId) * IRO[206].m1))
	#define TSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \		#define TSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
	(IRO[105].base + ((funcId) * IRO[105].m1))		(IRO[109].base + ((funcId) * IRO[109].m1))
	#define TSTORM_TCP_MAX_CWND_OFFSET(pfId) \		#define TSTORM_TCP_MAX_CWND_OFFSET(pfId) \
	(IRO[217].base + ((pfId) * IRO[217].m1))		(IRO[223].base + ((pfId) * IRO[223].m1))
	#define TSTORM_VF_TO_PF_OFFSET(funcId) \		#define TSTORM_VF_TO_PF_OFFSET(funcId) \
	(IRO[104].base + ((funcId) * IRO[104].m1))		(IRO[108].base + ((funcId) * IRO[108].m1))
	#define USTORM_AGG_DATA_OFFSET (IRO[206].base)		#define USTORM_AGG_DATA_OFFSET (IRO[212].base)
	#define USTORM_AGG_DATA_SIZE (IRO[206].size)		#define USTORM_AGG_DATA_SIZE (IRO[212].size)
	#define USTORM_ASSERT_LIST_INDEX_OFFSET (IRO[177].base)		#define USTORM_ASSERT_LIST_INDEX_OFFSET (IRO[181].base)
	#define USTORM_ASSERT_LIST_OFFSET(assertListEntry) \		#define USTORM_ASSERT_LIST_OFFSET(assertListEntry) \
	(IRO[176].base + ((assertListEntry) * IRO[176].m1))		(IRO[180].base + ((assertListEntry) * IRO[180].m1))
	#define USTORM_ETH_PAUSE_ENABLED_OFFSET(portId) \		#define USTORM_ETH_PAUSE_ENABLED_OFFSET(portId) \
	(IRO[183].base + ((portId) * IRO[183].m1))		(IRO[187].base + ((portId) * IRO[187].m1))
	#define USTORM_FCOE_EQ_PROD_OFFSET(pfId) \		#define USTORM_FCOE_EQ_PROD_OFFSET(pfId) \
	(IRO[319].base + ((pfId) * IRO[319].m1))		(IRO[325].base + ((pfId) * IRO[325].m1))
	#define USTORM_FUNC_EN_OFFSET(funcId) \		#define USTORM_FUNC_EN_OFFSET(funcId) \
	(IRO[178].base + ((funcId) * IRO[178].m1))		(IRO[182].base + ((funcId) * IRO[182].m1))
	#define USTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \		#define USTORM_ISCSI_CQ_SIZE_OFFSET(pfId) \
	(IRO[283].base + ((pfId) * IRO[283].m1))		(IRO[289].base + ((pfId) * IRO[289].m1))
	#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \		#define USTORM_ISCSI_CQ_SQN_SIZE_OFFSET(pfId) \
	(IRO[284].base + ((pfId) * IRO[284].m1))		(IRO[290].base + ((pfId) * IRO[290].m1))
	#define USTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \		#define USTORM_ISCSI_ERROR_BITMAP_OFFSET(pfId) \
	(IRO[288].base + ((pfId) * IRO[288].m1))		(IRO[294].base + ((pfId) * IRO[294].m1))
	#define USTORM_ISCSI_GLOBAL_BUF_PHYS_ADDR_OFFSET(pfId) \		#define USTORM_ISCSI_GLOBAL_BUF_PHYS_ADDR_OFFSET(pfId) \
	(IRO[285].base + ((pfId) * IRO[285].m1))		(IRO[291].base + ((pfId) * IRO[291].m1))
	#define USTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \		#define USTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
	(IRO[281].base + ((pfId) * IRO[281].m1))		(IRO[287].base + ((pfId) * IRO[287].m1))
	#define USTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \		#define USTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
	(IRO[280].base + ((pfId) * IRO[280].m1))		(IRO[286].base + ((pfId) * IRO[286].m1))
	#define USTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \		#define USTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
	(IRO[279].base + ((pfId) * IRO[279].m1))		(IRO[285].base + ((pfId) * IRO[285].m1))
	#define USTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \		#define USTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
	(IRO[282].base + ((pfId) * IRO[282].m1))		(IRO[288].base + ((pfId) * IRO[288].m1))
	#define USTORM_ISCSI_RQ_BUFFER_SIZE_OFFSET(pfId) \		#define USTORM_ISCSI_RQ_BUFFER_SIZE_OFFSET(pfId) \
	(IRO[286].base + ((pfId) * IRO[286].m1))		(IRO[292].base + ((pfId) * IRO[292].m1))
	#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \		#define USTORM_ISCSI_RQ_SIZE_OFFSET(pfId) \
	(IRO[287].base + ((pfId) * IRO[287].m1))		(IRO[293].base + ((pfId) * IRO[293].m1))
	#define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(pfId) \		#define USTORM_MEM_WORKAROUND_ADDRESS_OFFSET(pfId) \
	(IRO[182].base + ((pfId) * IRO[182].m1))		(IRO[186].base + ((pfId) * IRO[186].m1))
	#define USTORM_RECORD_SLOW_PATH_OFFSET(funcId) \		#define USTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
	(IRO[180].base + ((funcId) * IRO[180].m1))		(IRO[184].base + ((funcId) * IRO[184].m1))
	#define USTORM_RX_PRODS_E1X_OFFSET(portId, clientId) \		#define USTORM_RX_PRODS_E1X_OFFSET(portId, clientId) \
	(IRO[209].base + ((portId) * IRO[209].m1) + ((clientId) * \		(IRO[215].base + ((portId) * IRO[215].m1) + ((clientId) * \
	IRO[209].m2))		IRO[215].m2))
	#define USTORM_RX_PRODS_E2_OFFSET(qzoneId) \		#define USTORM_RX_PRODS_E2_OFFSET(qzoneId) \
	(IRO[210].base + ((qzoneId) * IRO[210].m1))		(IRO[216].base + ((qzoneId) * IRO[216].m1))
	#define USTORM_TPA_BTR_OFFSET (IRO[207].base)		#define USTORM_TPA_BTR_OFFSET (IRO[213].base)
	#define USTORM_TPA_BTR_SIZE (IRO[207].size)		#define USTORM_TPA_BTR_SIZE (IRO[213].size)
	#define USTORM_VF_TO_PF_OFFSET(funcId) \		#define USTORM_VF_TO_PF_OFFSET(funcId) \
	(IRO[179].base + ((funcId) * IRO[179].m1))		(IRO[183].base + ((funcId) * IRO[183].m1))
	#define XSTORM_AGG_INT_FINAL_CLEANUP_COMP_TYPE (IRO[67].base)		#define XSTORM_AGG_INT_FINAL_CLEANUP_COMP_TYPE (IRO[67].base)
	#define XSTORM_AGG_INT_FINAL_CLEANUP_INDEX (IRO[66].base)		#define XSTORM_AGG_INT_FINAL_CLEANUP_INDEX (IRO[66].base)
	#define XSTORM_ASSERT_LIST_INDEX_OFFSET (IRO[51].base)		#define XSTORM_ASSERT_LIST_INDEX_OFFSET (IRO[51].base)
	@@ -186,39 +186,39 @@
	#define XSTORM_FUNC_EN_OFFSET(funcId) \		#define XSTORM_FUNC_EN_OFFSET(funcId) \
	(IRO[47].base + ((funcId) * IRO[47].m1))		(IRO[47].base + ((funcId) * IRO[47].m1))
	#define XSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \		#define XSTORM_ISCSI_HQ_SIZE_OFFSET(pfId) \
	(IRO[296].base + ((pfId) * IRO[296].m1))		(IRO[302].base + ((pfId) * IRO[302].m1))
	#define XSTORM_ISCSI_LOCAL_MAC_ADDR0_OFFSET(pfId) \		#define XSTORM_ISCSI_LOCAL_MAC_ADDR0_OFFSET(pfId) \
	(IRO[299].base + ((pfId) * IRO[299].m1))		(IRO[305].base + ((pfId) * IRO[305].m1))
	#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \		#define XSTORM_ISCSI_LOCAL_MAC_ADDR1_OFFSET(pfId) \
	(IRO[300].base + ((pfId) * IRO[300].m1))		(IRO[306].base + ((pfId) * IRO[306].m1))
	#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \		#define XSTORM_ISCSI_LOCAL_MAC_ADDR2_OFFSET(pfId) \
	(IRO[301].base + ((pfId) * IRO[301].m1))		(IRO[307].base + ((pfId) * IRO[307].m1))
	#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \		#define XSTORM_ISCSI_LOCAL_MAC_ADDR3_OFFSET(pfId) \
	(IRO[302].base + ((pfId) * IRO[302].m1))		(IRO[308].base + ((pfId) * IRO[308].m1))
	#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \		#define XSTORM_ISCSI_LOCAL_MAC_ADDR4_OFFSET(pfId) \
	(IRO[303].base + ((pfId) * IRO[303].m1))		(IRO[309].base + ((pfId) * IRO[309].m1))
	#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \		#define XSTORM_ISCSI_LOCAL_MAC_ADDR5_OFFSET(pfId) \
	(IRO[304].base + ((pfId) * IRO[304].m1))		(IRO[310].base + ((pfId) * IRO[310].m1))
	#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \		#define XSTORM_ISCSI_LOCAL_VLAN_OFFSET(pfId) \
	(IRO[305].base + ((pfId) * IRO[305].m1))		(IRO[311].base + ((pfId) * IRO[311].m1))
	#define XSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \		#define XSTORM_ISCSI_NUM_OF_TASKS_OFFSET(pfId) \
	(IRO[295].base + ((pfId) * IRO[295].m1))		(IRO[301].base + ((pfId) * IRO[301].m1))
	#define XSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \		#define XSTORM_ISCSI_PAGE_SIZE_LOG_OFFSET(pfId) \
	(IRO[294].base + ((pfId) * IRO[294].m1))		(IRO[300].base + ((pfId) * IRO[300].m1))
	#define XSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \		#define XSTORM_ISCSI_PAGE_SIZE_OFFSET(pfId) \
	(IRO[293].base + ((pfId) * IRO[293].m1))		(IRO[299].base + ((pfId) * IRO[299].m1))
	#define XSTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \		#define XSTORM_ISCSI_R2TQ_SIZE_OFFSET(pfId) \
	(IRO[298].base + ((pfId) * IRO[298].m1))		(IRO[304].base + ((pfId) * IRO[304].m1))
	#define XSTORM_ISCSI_SQ_SIZE_OFFSET(pfId) \		#define XSTORM_ISCSI_SQ_SIZE_OFFSET(pfId) \
	(IRO[297].base + ((pfId) * IRO[297].m1))		(IRO[303].base + ((pfId) * IRO[303].m1))
	#define XSTORM_ISCSI_TCP_VARS_ADV_WND_SCL_OFFSET(pfId) \		#define XSTORM_ISCSI_TCP_VARS_ADV_WND_SCL_OFFSET(pfId) \
	(IRO[292].base + ((pfId) * IRO[292].m1))		(IRO[298].base + ((pfId) * IRO[298].m1))
	#define XSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \		#define XSTORM_ISCSI_TCP_VARS_FLAGS_OFFSET(pfId) \
	(IRO[291].base + ((pfId) * IRO[291].m1))		(IRO[297].base + ((pfId) * IRO[297].m1))
	#define XSTORM_ISCSI_TCP_VARS_TOS_OFFSET(pfId) \		#define XSTORM_ISCSI_TCP_VARS_TOS_OFFSET(pfId) \
	(IRO[290].base + ((pfId) * IRO[290].m1))		(IRO[296].base + ((pfId) * IRO[296].m1))
	#define XSTORM_ISCSI_TCP_VARS_TTL_OFFSET(pfId) \		#define XSTORM_ISCSI_TCP_VARS_TTL_OFFSET(pfId) \
	(IRO[289].base + ((pfId) * IRO[289].m1))		(IRO[295].base + ((pfId) * IRO[295].m1))
	#define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(pfId) \		#define XSTORM_RATE_SHAPING_PER_VN_VARS_OFFSET(pfId) \
	(IRO[44].base + ((pfId) * IRO[44].m1))		(IRO[44].base + ((pfId) * IRO[44].m1))
	#define XSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \		#define XSTORM_RECORD_SLOW_PATH_OFFSET(funcId) \
	@@ -231,16 +231,19 @@
	#define XSTORM_SPQ_PROD_OFFSET(funcId) \		#define XSTORM_SPQ_PROD_OFFSET(funcId) \
	(IRO[31].base + ((funcId) * IRO[31].m1))		(IRO[31].base + ((funcId) * IRO[31].m1))
	#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_ENABLED_OFFSET(portId) \		#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_ENABLED_OFFSET(portId) \
	(IRO[211].base + ((portId) * IRO[211].m1))		(IRO[217].base + ((portId) * IRO[217].m1))
	#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_MAX_COUNT_OFFSET(portId) \		#define XSTORM_TCP_GLOBAL_DEL_ACK_COUNTER_MAX_COUNT_OFFSET(portId) \
	(IRO[212].base + ((portId) * IRO[212].m1))		(IRO[218].base + ((portId) * IRO[218].m1))
	#define XSTORM_TCP_TX_SWS_TIMER_VAL_OFFSET(pfId) \		#define XSTORM_TCP_TX_SWS_TIMER_VAL_OFFSET(pfId) \
	(IRO[214].base + (((pfId)>>1) * IRO[214].m1) + (((pfId)&1) * \		(IRO[220].base + (((pfId)>>1) * IRO[220].m1) + (((pfId)&1) * \
	IRO[214].m2))		IRO[220].m2))
	#define XSTORM_VF_TO_PF_OFFSET(funcId) \		#define XSTORM_VF_TO_PF_OFFSET(funcId) \
	(IRO[48].base + ((funcId) * IRO[48].m1))		(IRO[48].base + ((funcId) * IRO[48].m1))
	#define COMMON_ASM_INVALID_ASSERT_OPCODE 0x0		#define COMMON_ASM_INVALID_ASSERT_OPCODE 0x0

			/* eth hsi version */
			#define ETH_FP_HSI_VERSION (ETH_FP_HSI_VER_2)

	/* Ethernet Ring parameters */		/* Ethernet Ring parameters */
	#define X_ETH_LOCAL_RING_SIZE 13		#define X_ETH_LOCAL_RING_SIZE 13
	#define FIRST_BD_IN_PKT 0		#define FIRST_BD_IN_PKT 0
	@@ -356,6 +359,7 @@
	#define XSEMI_CLK1_RESUL_CHIP (1e-3)		#define XSEMI_CLK1_RESUL_CHIP (1e-3)

	#define SDM_TIMER_TICK_RESUL_CHIP (4 * (1e-6))		#define SDM_TIMER_TICK_RESUL_CHIP (4 * (1e-6))
			#define TSDM_TIMER_TICK_RESUL_CHIP (1 * (1e-6))

	/** END DEFINES FOR TIMERS/CLOCKS RESOLUTIONS **/		/** END DEFINES FOR TIMERS/CLOCKS RESOLUTIONS **/

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

+120 −54

File changed.

Preview size limit exceeded, changes collapsed.

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

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7647,7 +7647,11 @@ static inline int bnx2x_func_switch_update(struct bnx2x *bp, int suspend)
	func_params.cmd = BNX2X_F_CMD_SWITCH_UPDATE;		func_params.cmd = BNX2X_F_CMD_SWITCH_UPDATE;

	/* Function parameters */		/* Function parameters */
	switch_update_params->suspend = suspend;		__set_bit(BNX2X_F_UPDATE_TX_SWITCH_SUSPEND_CHNG,
			&switch_update_params->changes);
			if (suspend)
			__set_bit(BNX2X_F_UPDATE_TX_SWITCH_SUSPEND,
			&switch_update_params->changes);

	rc = bnx2x_func_state_change(bp, &func_params);		rc = bnx2x_func_state_change(bp, &func_params);

Admin message