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

Commit 86564c3f authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: Remove many sparse warnings 



Remove most of the sparse warnings in the bnx2x compilation
(i.e., thus resulting when compiling with `C=2 CF=-D__CHECK_ENDIAN__').

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80bfe5cc

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

+24 −18
Original line number Diff line number Diff line
@@ -3128,17 +3128,21 @@ static noinline u16 bnx2x_tx_split(struct bnx2x *bp, 
	return bd_prod;

}



static inline u16 bnx2x_csum_fix(unsigned char *t_header, u16 csum, s8 fix)

#define bswab32(b32) ((__force __le32) swab32((__force __u32) (b32)))

#define bswab16(b16) ((__force __le16) swab16((__force __u16) (b16)))

static inline __le16 bnx2x_csum_fix(unsigned char *t_header, u16 csum, s8 fix)

{

	__sum16 tsum = (__force __sum16) csum;



	if (fix > 0)

		csum = (u16) ~csum_fold(csum_sub(csum,

		tsum = ~csum_fold(csum_sub((__force __wsum) csum,

				  csum_partial(t_header - fix, fix, 0)));



	else if (fix < 0)

		csum = (u16) ~csum_fold(csum_add(csum,

		tsum = ~csum_fold(csum_add((__force __wsum) csum,

				  csum_partial(t_header, -fix, 0)));



	return swab16(csum);

	return bswab16(csum);

}



static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)
@@ -3272,23 +3276,24 @@ static inline void bnx2x_set_pbd_gso(struct sk_buff *skb, 
				     u32 xmit_type)

{

	pbd->lso_mss = cpu_to_le16(skb_shinfo(skb)->gso_size);

	pbd->tcp_send_seq = swab32(tcp_hdr(skb)->seq);

	pbd->tcp_send_seq = bswab32(tcp_hdr(skb)->seq);

	pbd->tcp_flags = pbd_tcp_flags(skb);



	if (xmit_type & XMIT_GSO_V4) {

		pbd->ip_id = swab16(ip_hdr(skb)->id);

		pbd->ip_id = bswab16(ip_hdr(skb)->id);

		pbd->tcp_pseudo_csum =

			swab16(~csum_tcpudp_magic(ip_hdr(skb)->saddr,

			bswab16(~csum_tcpudp_magic(ip_hdr(skb)->saddr,

						   ip_hdr(skb)->daddr,

						   0, IPPROTO_TCP, 0));



	} else

		pbd->tcp_pseudo_csum =

			swab16(~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,

			bswab16(~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,

						 &ipv6_hdr(skb)->daddr,

						 0, IPPROTO_TCP, 0));



	pbd->global_data |= ETH_TX_PARSE_BD_E1X_PSEUDO_CS_WITHOUT_LEN;

	pbd->global_data |=

		cpu_to_le16(ETH_TX_PARSE_BD_E1X_PSEUDO_CS_WITHOUT_LEN);

}



/**
@@ -3354,7 +3359,8 @@ static inline u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb, 


	/* for now NS flag is not used in Linux */

	pbd->global_data =

		(hlen | ((skb->protocol == cpu_to_be16(ETH_P_8021Q)) <<

		cpu_to_le16(hlen |

			    ((skb->protocol == cpu_to_be16(ETH_P_8021Q)) <<

			     ETH_TX_PARSE_BD_E1X_LLC_SNAP_EN_SHIFT));



	pbd->ip_hlen_w = (skb_transport_header(skb) -
@@ -3372,7 +3378,7 @@ static inline u8 bnx2x_set_pbd_csum(struct bnx2x *bp, struct sk_buff *skb, 
	hlen = hlen*2;



	if (xmit_type & XMIT_CSUM_TCP) {

		pbd->tcp_pseudo_csum = swab16(tcp_hdr(skb)->check);

		pbd->tcp_pseudo_csum = bswab16(tcp_hdr(skb)->check);



	} else {

		s8 fix = SKB_CS_OFF(skb); /* signed! */

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

+2 −2
Original line number Diff line number Diff line
@@ -983,8 +983,8 @@ static inline int bnx2x_func_start(struct bnx2x *bp) 
 * @fw_lo:	pointer to lower part

 * @mac:	pointer to MAC address

 */

static inline void bnx2x_set_fw_mac_addr(u16 *fw_hi, u16 *fw_mid, u16 *fw_lo,

					 u8 *mac)

static inline void bnx2x_set_fw_mac_addr(__le16 *fw_hi, __le16 *fw_mid,

					 __le16 *fw_lo, u8 *mac)

{

	((u8 *)fw_hi)[0]  = mac[1];

	((u8 *)fw_hi)[1]  = mac[0];

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

+15 −11
Original line number Diff line number Diff line
@@ -3378,6 +3378,10 @@ struct regpair { 
	__le32 hi;

};



struct regpair_native {

	u32 lo;

	u32 hi;

};



/*

 * Classify rule opcodes in E2/E3
@@ -4404,13 +4408,13 @@ struct tstorm_eth_function_common_config { 
 * MAC filtering configuration parameters per port in Tstorm

 */

struct tstorm_eth_mac_filter_config {

	__le32 ucast_drop_all;

	__le32 ucast_accept_all;

	__le32 mcast_drop_all;

	__le32 mcast_accept_all;

	__le32 bcast_accept_all;

	__le32 vlan_filter[2];

	__le32 unmatched_unicast;

	u32 ucast_drop_all;

	u32 ucast_accept_all;

	u32 mcast_drop_all;

	u32 mcast_accept_all;

	u32 bcast_accept_all;

	u32 vlan_filter[2];

	u32 unmatched_unicast;

};
@@ -4902,7 +4906,7 @@ union event_data { 
 * per PF event ring data

 */

struct event_ring_data {

	struct regpair base_addr;

	struct regpair_native base_addr;

#if defined(__BIG_ENDIAN)

	u8 index_id;

	u8 sb_id;
@@ -5135,7 +5139,7 @@ struct pci_entity { 
 * The fast-path status block meta-data, common to all chips

 */

struct hc_sb_data {

	struct regpair host_sb_addr;

	struct regpair_native host_sb_addr;

	struct hc_status_block_sm state_machine[HC_SB_MAX_SM];

	struct pci_entity p_func;

#if defined(__BIG_ENDIAN)
@@ -5149,7 +5153,7 @@ struct hc_sb_data { 
	u8 state;

	u8 rsrv0;

#endif

	struct regpair rsrv1[2];

	struct regpair_native rsrv1[2];

};
@@ -5167,7 +5171,7 @@ enum hc_segment { 
 * The fast-path status block meta-data

 */

struct hc_sp_status_block_data {

	struct regpair host_sb_addr;

	struct regpair_native host_sb_addr;

#if defined(__BIG_ENDIAN)

	u8 rsrv1;

	u8 state;

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

+3 −3
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static void bnx2x_init_wr_zp(struct bnx2x *bp, u32 addr, u32 len, 
	/* gunzip_outlen is in dwords */

	len = GUNZIP_OUTLEN(bp);

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

		((u32 *)GUNZIP_BUF(bp))[i] =

		((u32 *)GUNZIP_BUF(bp))[i] = (__force u32)

				cpu_to_le32(((u32 *)GUNZIP_BUF(bp))[i]);



	bnx2x_write_big_buf_wb(bp, addr, len);
@@ -232,7 +232,7 @@ static void bnx2x_init_block(struct bnx2x *bp, u32 block, u32 stage) 
	u16 op_end =

		INIT_OPS_OFFSETS(bp)[BLOCK_OPS_IDX(block, stage,

						     STAGE_END)];

	union init_op *op;

	const union init_op *op;

	u32 op_idx, op_type, addr, len;

	const u32 *data, *data_base;
@@ -244,7 +244,7 @@ static void bnx2x_init_block(struct bnx2x *bp, u32 block, u32 stage) 


	for (op_idx = op_start; op_idx < op_end; op_idx++) {



		op = (union init_op *)&(INIT_OPS(bp)[op_idx]);

		op = (const union init_op *)&(INIT_OPS(bp)[op_idx]);

		/* Get generic data */

		op_type = op->raw.op;

		addr = op->raw.offset;

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

+81 −67
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ void bnx2x_tx_hw_flushed(struct bnx2x *bp, u32 poll_count) 


int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func, u32 poll_cnt)

{

	struct sdm_op_gen op_gen = {0};

	u32 op_gen_command = 0;



	u32 comp_addr = BAR_CSTRORM_INTMEM +

			CSTORM_FINAL_CLEANUP_COMPLETE_OFFSET(clnup_func);
@@ -1321,13 +1321,13 @@ int bnx2x_send_final_clnup(struct bnx2x *bp, u8 clnup_func, u32 poll_cnt) 
		return 1;

	}



	op_gen.command |= OP_GEN_PARAM(XSTORM_AGG_INT_FINAL_CLEANUP_INDEX);

	op_gen.command |= OP_GEN_TYPE(XSTORM_AGG_INT_FINAL_CLEANUP_COMP_TYPE);

	op_gen.command |= OP_GEN_AGG_VECT(clnup_func);

	op_gen.command |= 1 << SDM_OP_GEN_AGG_VECT_IDX_VALID_SHIFT;

	op_gen_command |= OP_GEN_PARAM(XSTORM_AGG_INT_FINAL_CLEANUP_INDEX);

	op_gen_command |= OP_GEN_TYPE(XSTORM_AGG_INT_FINAL_CLEANUP_COMP_TYPE);

	op_gen_command |= OP_GEN_AGG_VECT(clnup_func);

	op_gen_command |= 1 << SDM_OP_GEN_AGG_VECT_IDX_VALID_SHIFT;



	DP(BNX2X_MSG_SP, "sending FW Final cleanup\n");

	REG_WR(bp, XSDM_REG_OPERATION_GEN, op_gen.command);

	REG_WR(bp, XSDM_REG_OPERATION_GEN, op_gen_command);



	if (bnx2x_flr_clnup_reg_poll(bp, comp_addr, 1, poll_cnt) != 1) {

		BNX2X_ERR("FW final cleanup did not succeed\n");
@@ -2641,7 +2641,7 @@ void bnx2x__link_status_update(struct bnx2x *bp) 
static int bnx2x_afex_func_update(struct bnx2x *bp, u16 vifid,

				  u16 vlan_val, u8 allowed_prio)

{

	struct bnx2x_func_state_params func_params = {0};

	struct bnx2x_func_state_params func_params = {NULL};

	struct bnx2x_func_afex_update_params *f_update_params =

		&func_params.params.afex_update;
@@ -2666,7 +2666,7 @@ static int bnx2x_afex_func_update(struct bnx2x *bp, u16 vifid, 
static int bnx2x_afex_handle_vif_list_cmd(struct bnx2x *bp, u8 cmd_type,

					  u16 vif_index, u8 func_bit_map)

{

	struct bnx2x_func_state_params func_params = {0};

	struct bnx2x_func_state_params func_params = {NULL};

	struct bnx2x_func_afex_viflists_params *update_params =

		&func_params.params.afex_viflists;

	int rc;
@@ -2682,7 +2682,7 @@ static int bnx2x_afex_handle_vif_list_cmd(struct bnx2x *bp, u8 cmd_type, 


	/* set parameters according to cmd_type */

	update_params->afex_vif_list_command = cmd_type;

	update_params->vif_list_index = cpu_to_le16(vif_index);

	update_params->vif_list_index = vif_index;

	update_params->func_bit_map =

		(cmd_type == VIF_LIST_RULE_GET) ? 0 : func_bit_map;

	update_params->func_to_clear = 0;
@@ -3189,7 +3189,7 @@ static void bnx2x_pf_init(struct bnx2x *bp) 
	if (bp->port.pmf)

		storm_memset_cmng(bp, &bp->cmng, BP_PORT(bp));



	/* init Event Queue */

	/* init Event Queue - PCI bus guarantees correct endianity*/

	eq_data.base_addr.hi = U64_HI(bp->eq_mapping);

	eq_data.base_addr.lo = U64_LO(bp->eq_mapping);

	eq_data.producer = bp->eq_prod;
@@ -3279,64 +3279,74 @@ static void bnx2x_drv_info_fcoe_stat(struct bnx2x *bp) 
		struct fcoe_statistics_params *fw_fcoe_stat =

			&bp->fw_stats_data->fcoe;



		ADD_64(fcoe_stat->rx_bytes_hi, 0, fcoe_stat->rx_bytes_lo,

		ADD_64_LE(fcoe_stat->rx_bytes_hi, LE32_0,

			  fcoe_stat->rx_bytes_lo,

			  fw_fcoe_stat->rx_stat0.fcoe_rx_byte_cnt);



		ADD_64(fcoe_stat->rx_bytes_hi,

		ADD_64_LE(fcoe_stat->rx_bytes_hi,

			  fcoe_q_tstorm_stats->rcv_ucast_bytes.hi,

			  fcoe_stat->rx_bytes_lo,

			  fcoe_q_tstorm_stats->rcv_ucast_bytes.lo);



		ADD_64(fcoe_stat->rx_bytes_hi,

		ADD_64_LE(fcoe_stat->rx_bytes_hi,

			  fcoe_q_tstorm_stats->rcv_bcast_bytes.hi,

			  fcoe_stat->rx_bytes_lo,

			  fcoe_q_tstorm_stats->rcv_bcast_bytes.lo);



		ADD_64(fcoe_stat->rx_bytes_hi,

		ADD_64_LE(fcoe_stat->rx_bytes_hi,

			  fcoe_q_tstorm_stats->rcv_mcast_bytes.hi,

			  fcoe_stat->rx_bytes_lo,

			  fcoe_q_tstorm_stats->rcv_mcast_bytes.lo);



		ADD_64(fcoe_stat->rx_frames_hi, 0, fcoe_stat->rx_frames_lo,

		ADD_64_LE(fcoe_stat->rx_frames_hi, LE32_0,

			  fcoe_stat->rx_frames_lo,

			  fw_fcoe_stat->rx_stat0.fcoe_rx_pkt_cnt);



		ADD_64(fcoe_stat->rx_frames_hi, 0, fcoe_stat->rx_frames_lo,

		ADD_64_LE(fcoe_stat->rx_frames_hi, LE32_0,

			  fcoe_stat->rx_frames_lo,

			  fcoe_q_tstorm_stats->rcv_ucast_pkts);



		ADD_64(fcoe_stat->rx_frames_hi, 0, fcoe_stat->rx_frames_lo,

		ADD_64_LE(fcoe_stat->rx_frames_hi, LE32_0,

			  fcoe_stat->rx_frames_lo,

			  fcoe_q_tstorm_stats->rcv_bcast_pkts);



		ADD_64(fcoe_stat->rx_frames_hi, 0, fcoe_stat->rx_frames_lo,

		ADD_64_LE(fcoe_stat->rx_frames_hi, LE32_0,

			  fcoe_stat->rx_frames_lo,

			  fcoe_q_tstorm_stats->rcv_mcast_pkts);



		ADD_64(fcoe_stat->tx_bytes_hi, 0, fcoe_stat->tx_bytes_lo,

		ADD_64_LE(fcoe_stat->tx_bytes_hi, LE32_0,

			  fcoe_stat->tx_bytes_lo,

			  fw_fcoe_stat->tx_stat.fcoe_tx_byte_cnt);



		ADD_64(fcoe_stat->tx_bytes_hi,

		ADD_64_LE(fcoe_stat->tx_bytes_hi,

			  fcoe_q_xstorm_stats->ucast_bytes_sent.hi,

			  fcoe_stat->tx_bytes_lo,

			  fcoe_q_xstorm_stats->ucast_bytes_sent.lo);



		ADD_64(fcoe_stat->tx_bytes_hi,

		ADD_64_LE(fcoe_stat->tx_bytes_hi,

			  fcoe_q_xstorm_stats->bcast_bytes_sent.hi,

			  fcoe_stat->tx_bytes_lo,

			  fcoe_q_xstorm_stats->bcast_bytes_sent.lo);



		ADD_64(fcoe_stat->tx_bytes_hi,

		ADD_64_LE(fcoe_stat->tx_bytes_hi,

			  fcoe_q_xstorm_stats->mcast_bytes_sent.hi,

			  fcoe_stat->tx_bytes_lo,

			  fcoe_q_xstorm_stats->mcast_bytes_sent.lo);



		ADD_64(fcoe_stat->tx_frames_hi, 0, fcoe_stat->tx_frames_lo,

		ADD_64_LE(fcoe_stat->tx_frames_hi, LE32_0,

			  fcoe_stat->tx_frames_lo,

			  fw_fcoe_stat->tx_stat.fcoe_tx_pkt_cnt);



		ADD_64(fcoe_stat->tx_frames_hi, 0, fcoe_stat->tx_frames_lo,

		ADD_64_LE(fcoe_stat->tx_frames_hi, LE32_0,

			  fcoe_stat->tx_frames_lo,

			  fcoe_q_xstorm_stats->ucast_pkts_sent);



		ADD_64(fcoe_stat->tx_frames_hi, 0, fcoe_stat->tx_frames_lo,

		ADD_64_LE(fcoe_stat->tx_frames_hi, LE32_0,

			  fcoe_stat->tx_frames_lo,

			  fcoe_q_xstorm_stats->bcast_pkts_sent);



		ADD_64(fcoe_stat->tx_frames_hi, 0, fcoe_stat->tx_frames_lo,

		ADD_64_LE(fcoe_stat->tx_frames_hi, LE32_0,

			  fcoe_stat->tx_frames_lo,

			  fcoe_q_xstorm_stats->mcast_pkts_sent);

	}
@@ -4829,7 +4839,8 @@ static void bnx2x_handle_classification_eqe(struct bnx2x *bp, 
	/* Always push next commands out, don't wait here */

	__set_bit(RAMROD_CONT, &ramrod_flags);



	switch (elem->message.data.eth_event.echo >> BNX2X_SWCID_SHIFT) {

	switch (le32_to_cpu((__force __le32)elem->message.data.eth_event.echo)

			    >> BNX2X_SWCID_SHIFT) {

	case BNX2X_FILTER_MAC_PENDING:

		DP(BNX2X_MSG_SP, "Got SETUP_MAC completions\n");

		if (CNIC_LOADED(bp) && (cid == BNX2X_ISCSI_ETH_CID(bp)))
@@ -5016,9 +5027,11 @@ static void bnx2x_eq_int(struct bnx2x *bp) 
			   rc);

			goto next_spqe;

		}

		cid = SW_CID(elem->message.data.cfc_del_event.cid);

		opcode = elem->message.opcode;



		/* elem CID originates from FW; actually LE */

		cid = SW_CID((__force __le32)

			     elem->message.data.cfc_del_event.cid);

		opcode = elem->message.opcode;



		/* handle eq element */

		switch (opcode) {
@@ -5537,7 +5550,7 @@ void bnx2x_init_sb(struct bnx2x *bp, dma_addr_t mapping, int vfid, 


	DP(NETIF_MSG_IFUP, "Init FW SB %d\n", fw_sb_id);



	/* write indecies to HW */

	/* write indices to HW - PCI guarantees endianity of regpairs */

	bnx2x_wr_fp_sb_data(bp, fw_sb_id, sb_data_p, data_size);

}
@@ -5625,6 +5638,7 @@ static void bnx2x_init_def_sb(struct bnx2x *bp) 


	bnx2x_zero_sp_sb(bp);



	/* PCI guarantees endianity of regpairs */

	sp_sb_data.state		= SB_ENABLED;

	sp_sb_data.host_sb_addr.lo	= U64_LO(section);

	sp_sb_data.host_sb_addr.hi	= U64_HI(section);
@@ -5722,7 +5736,7 @@ int bnx2x_set_q_rx_mode(struct bnx2x *bp, u8 cl_id, 
	return 0;

}



int bnx2x_fill_accept_flags(struct bnx2x *bp, u32 rx_mode,

static int bnx2x_fill_accept_flags(struct bnx2x *bp, u32 rx_mode,

				   unsigned long *rx_accept_flags,

				   unsigned long *tx_accept_flags)

{
@@ -10541,10 +10555,10 @@ static void bnx2x_link_settings_requested(struct bnx2x *bp) 


static void bnx2x_set_mac_buf(u8 *mac_buf, u32 mac_lo, u16 mac_hi)

{

	mac_hi = cpu_to_be16(mac_hi);

	mac_lo = cpu_to_be32(mac_lo);

	memcpy(mac_buf, &mac_hi, sizeof(mac_hi));

	memcpy(mac_buf + sizeof(mac_hi), &mac_lo, sizeof(mac_lo));

	__be16 mac_hi_be = cpu_to_be16(mac_hi);

	__be32 mac_lo_be = cpu_to_be32(mac_lo);

	memcpy(mac_buf, &mac_hi_be, sizeof(mac_hi_be));

	memcpy(mac_buf + sizeof(mac_hi_be), &mac_lo_be, sizeof(mac_lo_be));

}



static void bnx2x_get_port_hwinfo(struct bnx2x *bp)
@@ -12005,7 +12019,7 @@ static int bnx2x_check_firmware(struct bnx2x *bp) 
	struct bnx2x_fw_file_hdr *fw_hdr;

	struct bnx2x_fw_file_section *sections;

	u32 offset, len, num_ops;

	u16 *ops_offsets;

	__be16 *ops_offsets;

	int i;

	const u8 *fw_ver;
@@ -12030,7 +12044,7 @@ static int bnx2x_check_firmware(struct bnx2x *bp) 


	/* Likewise for the init_ops offsets */

	offset = be32_to_cpu(fw_hdr->init_ops_offsets.offset);

	ops_offsets = (u16 *)(firmware->data + offset);

	ops_offsets = (__force __be16 *)(firmware->data + offset);

	num_ops = be32_to_cpu(fw_hdr->init_ops.len) / sizeof(struct raw_op);



	for (i = 0; i < be32_to_cpu(fw_hdr->init_ops_offsets.len) / 2; i++) {