bnx2x: Remove many sparse warnings
authorYuval Mintz <yuvalmin@broadcom.com>
Wed, 23 Jan 2013 03:21:50 +0000 (03:21 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Jan 2013 18:58:29 +0000 (13:58 -0500)
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: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h

index a4611386afeb6b25e86ac2fc1a1e3d2bbc56ea76..ecac04a3687c6b2967ccc3e8e1ab78bf2107e4e9 100644 (file)
@@ -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,
-                               csum_partial(t_header - fix, fix, 0)));
+               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,
-                               csum_partial(t_header, -fix, 0)));
+               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,
-                                                 ip_hdr(skb)->daddr,
-                                                 0, IPPROTO_TCP, 0));
+                       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,
-                                               &ipv6_hdr(skb)->daddr,
-                                               0, IPPROTO_TCP, 0));
+                       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,8 +3359,9 @@ 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)) <<
-                        ETH_TX_PARSE_BD_E1X_LLC_SNAP_EN_SHIFT));
+               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) -
                        skb_network_header(skb)) >> 1;
@@ -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! */
index 9b6e27acb54c08d942edf8d6a910d963953fd1db..4635c025bc2d230c8f8b137d4676ac12d93e95db 100644 (file)
@@ -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];
index 76e30c9a2955177c8d88d4595166ce60c6a1d4a7..037860ecc3434cffca9ee555846ae21dbe8600ab 100644 (file)
@@ -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;
index ae9b6ff30e3989f24c261fb27fecc45cb76a6fbc..8ab0dd90096085b33f4ee831f6487c3766b164af 100644 (file)
@@ -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;
index c9effad3c36225039246c446a20b7957c99996e4..f511c3cb4872e74003e801129821eb0e9102db5f 100644 (file)
@@ -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,65 +3279,75 @@ 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,
-                      fw_fcoe_stat->rx_stat0.fcoe_rx_byte_cnt);
+               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,
-                      fcoe_q_tstorm_stats->rcv_ucast_bytes.hi,
-                      fcoe_stat->rx_bytes_lo,
-                      fcoe_q_tstorm_stats->rcv_ucast_bytes.lo);
+               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,
-                      fcoe_q_tstorm_stats->rcv_bcast_bytes.hi,
-                      fcoe_stat->rx_bytes_lo,
-                      fcoe_q_tstorm_stats->rcv_bcast_bytes.lo);
+               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,
-                      fcoe_q_tstorm_stats->rcv_mcast_bytes.hi,
-                      fcoe_stat->rx_bytes_lo,
-                      fcoe_q_tstorm_stats->rcv_mcast_bytes.lo);
+               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,
-                      fw_fcoe_stat->rx_stat0.fcoe_rx_pkt_cnt);
+               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,
-                      fcoe_q_tstorm_stats->rcv_ucast_pkts);
+               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,
-                      fcoe_q_tstorm_stats->rcv_bcast_pkts);
+               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,
-                      fcoe_q_tstorm_stats->rcv_mcast_pkts);
+               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,
-                      fw_fcoe_stat->tx_stat.fcoe_tx_byte_cnt);
+               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,
-                      fcoe_q_xstorm_stats->ucast_bytes_sent.hi,
-                      fcoe_stat->tx_bytes_lo,
-                      fcoe_q_xstorm_stats->ucast_bytes_sent.lo);
+               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,
-                      fcoe_q_xstorm_stats->bcast_bytes_sent.hi,
-                      fcoe_stat->tx_bytes_lo,
-                      fcoe_q_xstorm_stats->bcast_bytes_sent.lo);
+               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,
-                      fcoe_q_xstorm_stats->mcast_bytes_sent.hi,
-                      fcoe_stat->tx_bytes_lo,
-                      fcoe_q_xstorm_stats->mcast_bytes_sent.lo);
+               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,
-                      fw_fcoe_stat->tx_stat.fcoe_tx_pkt_cnt);
+               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,
-                      fcoe_q_xstorm_stats->ucast_pkts_sent);
+               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,
-                      fcoe_q_xstorm_stats->bcast_pkts_sent);
+               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,
-                      fcoe_q_xstorm_stats->mcast_pkts_sent);
+               ADD_64_LE(fcoe_stat->tx_frames_hi, LE32_0,
+                         fcoe_stat->tx_frames_lo,
+                         fcoe_q_xstorm_stats->mcast_pkts_sent);
        }
 
        /* ask L5 driver to add data to the struct */
@@ -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,9 +5736,9 @@ 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,
-                           unsigned long *rx_accept_flags,
-                           unsigned long *tx_accept_flags)
+static int bnx2x_fill_accept_flags(struct bnx2x *bp, u32 rx_mode,
+                                  unsigned long *rx_accept_flags,
+                                  unsigned long *tx_accept_flags)
 {
        /* Clear the flags first */
        *rx_accept_flags = 0;
@@ -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++) {
index 7d6d601a84203a39f4b2849b3bf6322c4078c65a..7306416bc90d29af91461440ff19da77f07429e7 100644 (file)
@@ -707,7 +707,8 @@ static inline void bnx2x_vlan_mac_set_cmd_hdr_e2(struct bnx2x *bp,
 static inline void bnx2x_vlan_mac_set_rdata_hdr_e2(u32 cid, int type,
                                struct eth_classify_header *hdr, int rule_cnt)
 {
-       hdr->echo = (cid & BNX2X_SWCID_MASK) | (type << BNX2X_SWCID_SHIFT);
+       hdr->echo = cpu_to_le32((cid & BNX2X_SWCID_MASK) |
+                               (type << BNX2X_SWCID_SHIFT));
        hdr->rule_cnt = (u8)rule_cnt;
 }
 
@@ -813,8 +814,9 @@ static inline void bnx2x_vlan_mac_set_rdata_hdr_e1x(struct bnx2x *bp,
 
        hdr->length = 1;
        hdr->offset = (u8)cam_offset;
-       hdr->client_id = 0xff;
-       hdr->echo = ((r->cid & BNX2X_SWCID_MASK) | (type << BNX2X_SWCID_SHIFT));
+       hdr->client_id = cpu_to_le16(0xff);
+       hdr->echo = cpu_to_le32((r->cid & BNX2X_SWCID_MASK) |
+                               (type << BNX2X_SWCID_SHIFT));
 }
 
 static inline void bnx2x_vlan_mac_set_cfg_entry_e1x(struct bnx2x *bp,
@@ -903,7 +905,7 @@ static void bnx2x_set_one_vlan_e2(struct bnx2x *bp,
                (struct eth_classify_rules_ramrod_data *)(raw->rdata);
        int rule_cnt = rule_idx + 1;
        union eth_classify_rule_cmd *rule_entry = &data->rules[rule_idx];
-       int cmd = elem->cmd_data.vlan_mac.cmd;
+       enum bnx2x_vlan_mac_cmd cmd = elem->cmd_data.vlan_mac.cmd;
        bool add = (cmd == BNX2X_VLAN_MAC_ADD) ? true : false;
        u16 vlan = elem->cmd_data.vlan_mac.u.vlan.vlan;
 
@@ -953,7 +955,7 @@ static void bnx2x_set_one_vlan_mac_e2(struct bnx2x *bp,
                (struct eth_classify_rules_ramrod_data *)(raw->rdata);
        int rule_cnt = rule_idx + 1;
        union eth_classify_rule_cmd *rule_entry = &data->rules[rule_idx];
-       int cmd = elem->cmd_data.vlan_mac.cmd;
+       enum bnx2x_vlan_mac_cmd cmd = elem->cmd_data.vlan_mac.cmd;
        bool add = (cmd == BNX2X_VLAN_MAC_ADD) ? true : false;
        u16 vlan = elem->cmd_data.vlan_mac.u.vlan_mac.vlan;
        u8 *mac = elem->cmd_data.vlan_mac.u.vlan_mac.mac;
@@ -1532,7 +1534,7 @@ static inline int bnx2x_vlan_mac_get_registry_elem(
        bool restore,
        struct bnx2x_vlan_mac_registry_elem **re)
 {
-       int cmd = elem->cmd_data.vlan_mac.cmd;
+       enum bnx2x_vlan_mac_cmd cmd = elem->cmd_data.vlan_mac.cmd;
        struct bnx2x_vlan_mac_registry_elem *reg_elem;
 
        /* Allocate a new registry element if needed. */
@@ -1591,7 +1593,7 @@ static int bnx2x_execute_vlan_mac(struct bnx2x *bp,
        bool restore = test_bit(RAMROD_RESTORE, ramrod_flags);
        bool drv_only = test_bit(RAMROD_DRV_CLR_ONLY, ramrod_flags);
        struct bnx2x_vlan_mac_registry_elem *reg_elem;
-       int cmd;
+       enum bnx2x_vlan_mac_cmd cmd;
 
        /*
         * If DRIVER_ONLY execution is requested, cleanup a registry
@@ -2186,7 +2188,7 @@ static inline void bnx2x_rx_mode_set_rdata_hdr_e2(u32 cid,
                                struct eth_classify_header *hdr,
                                u8 rule_cnt)
 {
-       hdr->echo = cid;
+       hdr->echo = cpu_to_le32(cid);
        hdr->rule_cnt = rule_cnt;
 }
 
@@ -2433,7 +2435,7 @@ static int bnx2x_mcast_wait(struct bnx2x *bp,
 static int bnx2x_mcast_enqueue_cmd(struct bnx2x *bp,
                                   struct bnx2x_mcast_obj *o,
                                   struct bnx2x_mcast_ramrod_params *p,
-                                  int cmd)
+                                  enum bnx2x_mcast_cmd cmd)
 {
        int total_sz;
        struct bnx2x_pending_mcast_cmd *new_cmd;
@@ -2565,7 +2567,7 @@ static inline u8 bnx2x_mcast_get_rx_tx_flag(struct bnx2x_mcast_obj *o)
 static void bnx2x_mcast_set_one_rule_e2(struct bnx2x *bp,
                                        struct bnx2x_mcast_obj *o, int idx,
                                        union bnx2x_mcast_config_data *cfg_data,
-                                       int cmd)
+                                       enum bnx2x_mcast_cmd cmd)
 {
        struct bnx2x_raw_obj *r = &o->raw;
        struct eth_multicast_rules_ramrod_data *data =
@@ -2629,7 +2631,7 @@ static inline int bnx2x_mcast_handle_restore_cmd_e2(
        int *rdata_idx)
 {
        int cur_bin, cnt = *rdata_idx;
-       union bnx2x_mcast_config_data cfg_data = {0};
+       union bnx2x_mcast_config_data cfg_data = {NULL};
 
        /* go through the registry and configure the bins from it */
        for (cur_bin = bnx2x_mcast_get_next_bin(o, start_bin); cur_bin >= 0;
@@ -2661,7 +2663,7 @@ static inline void bnx2x_mcast_hdl_pending_add_e2(struct bnx2x *bp,
 {
        struct bnx2x_mcast_mac_elem *pmac_pos, *pmac_pos_n;
        int cnt = *line_idx;
-       union bnx2x_mcast_config_data cfg_data = {0};
+       union bnx2x_mcast_config_data cfg_data = {NULL};
 
        list_for_each_entry_safe(pmac_pos, pmac_pos_n, &cmd_pos->data.macs_head,
                                 link) {
@@ -2784,7 +2786,7 @@ static inline void bnx2x_mcast_hdl_add(struct bnx2x *bp,
        int *line_idx)
 {
        struct bnx2x_mcast_list_elem *mlist_pos;
-       union bnx2x_mcast_config_data cfg_data = {0};
+       union bnx2x_mcast_config_data cfg_data = {NULL};
        int cnt = *line_idx;
 
        list_for_each_entry(mlist_pos, &p->mcast_list, link) {
@@ -2831,7 +2833,8 @@ static inline void bnx2x_mcast_hdl_del(struct bnx2x *bp,
  * Returns number of lines filled in the ramrod data in total.
  */
 static inline int bnx2x_mcast_handle_current_cmd(struct bnx2x *bp,
-                       struct bnx2x_mcast_ramrod_params *p, int cmd,
+                       struct bnx2x_mcast_ramrod_params *p,
+                       enum bnx2x_mcast_cmd cmd,
                        int start_cnt)
 {
        struct bnx2x_mcast_obj *o = p->mcast_obj;
@@ -2865,7 +2868,7 @@ static inline int bnx2x_mcast_handle_current_cmd(struct bnx2x *bp,
 
 static int bnx2x_mcast_validate_e2(struct bnx2x *bp,
                                   struct bnx2x_mcast_ramrod_params *p,
-                                  int cmd)
+                                  enum bnx2x_mcast_cmd cmd)
 {
        struct bnx2x_mcast_obj *o = p->mcast_obj;
        int reg_sz = o->get_registry_size(o);
@@ -2934,8 +2937,9 @@ static inline void bnx2x_mcast_set_rdata_hdr_e2(struct bnx2x *bp,
        struct eth_multicast_rules_ramrod_data *data =
                (struct eth_multicast_rules_ramrod_data *)(r->rdata);
 
-       data->header.echo = ((r->cid & BNX2X_SWCID_MASK) |
-                         (BNX2X_FILTER_MCAST_PENDING << BNX2X_SWCID_SHIFT));
+       data->header.echo = cpu_to_le32((r->cid & BNX2X_SWCID_MASK) |
+                                       (BNX2X_FILTER_MCAST_PENDING <<
+                                        BNX2X_SWCID_SHIFT));
        data->header.rule_cnt = len;
 }
 
@@ -2969,7 +2973,7 @@ static inline int bnx2x_mcast_refresh_registry_e2(struct bnx2x *bp,
 
 static int bnx2x_mcast_setup_e2(struct bnx2x *bp,
                                struct bnx2x_mcast_ramrod_params *p,
-                               int cmd)
+                               enum bnx2x_mcast_cmd cmd)
 {
        struct bnx2x_raw_obj *raw = &p->mcast_obj->raw;
        struct bnx2x_mcast_obj *o = p->mcast_obj;
@@ -3055,7 +3059,7 @@ static int bnx2x_mcast_setup_e2(struct bnx2x *bp,
 
 static int bnx2x_mcast_validate_e1h(struct bnx2x *bp,
                                    struct bnx2x_mcast_ramrod_params *p,
-                                   int cmd)
+                                   enum bnx2x_mcast_cmd cmd)
 {
        /* Mark, that there is a work to do */
        if ((cmd == BNX2X_MCAST_CMD_DEL) || (cmd == BNX2X_MCAST_CMD_RESTORE))
@@ -3117,7 +3121,7 @@ static inline void bnx2x_mcast_hdl_restore_e1h(struct bnx2x *bp,
  */
 static int bnx2x_mcast_setup_e1h(struct bnx2x *bp,
                                 struct bnx2x_mcast_ramrod_params *p,
-                                int cmd)
+                                enum bnx2x_mcast_cmd cmd)
 {
        int i;
        struct bnx2x_mcast_obj *o = p->mcast_obj;
@@ -3171,7 +3175,7 @@ static int bnx2x_mcast_setup_e1h(struct bnx2x *bp,
 
 static int bnx2x_mcast_validate_e1(struct bnx2x *bp,
                                   struct bnx2x_mcast_ramrod_params *p,
-                                  int cmd)
+                                  enum bnx2x_mcast_cmd cmd)
 {
        struct bnx2x_mcast_obj *o = p->mcast_obj;
        int reg_sz = o->get_registry_size(o);
@@ -3244,7 +3248,7 @@ static void bnx2x_mcast_revert_e1(struct bnx2x *bp,
 static void bnx2x_mcast_set_one_rule_e1(struct bnx2x *bp,
                                        struct bnx2x_mcast_obj *o, int idx,
                                        union bnx2x_mcast_config_data *cfg_data,
-                                       int cmd)
+                                       enum bnx2x_mcast_cmd cmd)
 {
        struct bnx2x_raw_obj *r = &o->raw;
        struct mac_configuration_cmd *data =
@@ -3288,9 +3292,10 @@ static inline void bnx2x_mcast_set_rdata_hdr_e1(struct bnx2x *bp,
                     BNX2X_MAX_MULTICAST*(1 + r->func_id));
 
        data->hdr.offset = offset;
-       data->hdr.client_id = 0xff;
-       data->hdr.echo = ((r->cid & BNX2X_SWCID_MASK) |
-                         (BNX2X_FILTER_MCAST_PENDING << BNX2X_SWCID_SHIFT));
+       data->hdr.client_id = cpu_to_le16(0xff);
+       data->hdr.echo = cpu_to_le32((r->cid & BNX2X_SWCID_MASK) |
+                                    (BNX2X_FILTER_MCAST_PENDING <<
+                                     BNX2X_SWCID_SHIFT));
        data->hdr.length = len;
 }
 
@@ -3313,7 +3318,7 @@ static inline int bnx2x_mcast_handle_restore_cmd_e1(
 {
        struct bnx2x_mcast_mac_elem *elem;
        int i = 0;
-       union bnx2x_mcast_config_data cfg_data = {0};
+       union bnx2x_mcast_config_data cfg_data = {NULL};
 
        /* go through the registry and configure the MACs from it. */
        list_for_each_entry(elem, &o->registry.exact_match.macs, link) {
@@ -3338,7 +3343,7 @@ static inline int bnx2x_mcast_handle_pending_cmds_e1(
        struct bnx2x_pending_mcast_cmd *cmd_pos;
        struct bnx2x_mcast_mac_elem *pmac_pos;
        struct bnx2x_mcast_obj *o = p->mcast_obj;
-       union bnx2x_mcast_config_data cfg_data = {0};
+       union bnx2x_mcast_config_data cfg_data = {NULL};
        int cnt = 0;
 
 
@@ -3462,7 +3467,7 @@ static inline int bnx2x_mcast_refresh_registry_e1(struct bnx2x *bp,
 
 static int bnx2x_mcast_setup_e1(struct bnx2x *bp,
                                struct bnx2x_mcast_ramrod_params *p,
-                               int cmd)
+                               enum bnx2x_mcast_cmd cmd)
 {
        struct bnx2x_mcast_obj *o = p->mcast_obj;
        struct bnx2x_raw_obj *raw = &o->raw;
@@ -3566,7 +3571,7 @@ static void bnx2x_mcast_set_registry_size_aprox(struct bnx2x_mcast_obj *o,
 
 int bnx2x_config_mcast(struct bnx2x *bp,
                       struct bnx2x_mcast_ramrod_params *p,
-                      int cmd)
+                      enum bnx2x_mcast_cmd cmd)
 {
        struct bnx2x_mcast_obj *o = p->mcast_obj;
        struct bnx2x_raw_obj *r = &o->raw;
@@ -4089,8 +4094,8 @@ static int bnx2x_setup_rss(struct bnx2x *bp,
        DP(BNX2X_MSG_SP, "Configuring RSS\n");
 
        /* Set an echo field */
-       data->echo = (r->cid & BNX2X_SWCID_MASK) |
-                    (r->state << BNX2X_SWCID_SHIFT);
+       data->echo = cpu_to_le32((r->cid & BNX2X_SWCID_MASK) |
+                                (r->state << BNX2X_SWCID_SHIFT));
 
        /* RSS mode */
        if (test_bit(BNX2X_RSS_MODE_DISABLED, &p->rss_flags))
@@ -5749,21 +5754,20 @@ inline int bnx2x_func_send_afex_viflists(struct bnx2x *bp,
        struct bnx2x_func_sp_obj *o = params->f_obj;
        struct afex_vif_list_ramrod_data *rdata =
                (struct afex_vif_list_ramrod_data *)o->afex_rdata;
-       struct bnx2x_func_afex_viflists_params *afex_viflist_params =
+       struct bnx2x_func_afex_viflists_params *afex_vif_params =
                &params->params.afex_viflists;
        u64 *p_rdata = (u64 *)rdata;
 
        memset(rdata, 0, sizeof(*rdata));
 
        /* Fill the ramrod data with provided parameters */
-       rdata->vif_list_index = afex_viflist_params->vif_list_index;
-       rdata->func_bit_map = afex_viflist_params->func_bit_map;
-       rdata->afex_vif_list_command =
-               afex_viflist_params->afex_vif_list_command;
-       rdata->func_to_clear = afex_viflist_params->func_to_clear;
+       rdata->vif_list_index = cpu_to_le16(afex_vif_params->vif_list_index);
+       rdata->func_bit_map          = afex_vif_params->func_bit_map;
+       rdata->afex_vif_list_command = afex_vif_params->afex_vif_list_command;
+       rdata->func_to_clear         = afex_vif_params->func_to_clear;
 
        /* send in echo type of sub command */
-       rdata->echo = afex_viflist_params->afex_vif_list_command;
+       rdata->echo = afex_vif_params->afex_vif_list_command;
 
        /*  No need for an explicit memory barrier here as long we would
         *  need to ensure the ordering of writing to the SPQ element
index ff8887cfdb3c93f5100d8f27cf5faa992e4fe057..ff907609b9fc5cef7c975b2a28453d562e09fc02 100644 (file)
@@ -524,7 +524,7 @@ struct bnx2x_mcast_ramrod_params {
        int mcast_list_len;
 };
 
-enum {
+enum bnx2x_mcast_cmd {
        BNX2X_MCAST_CMD_ADD,
        BNX2X_MCAST_CMD_CONT,
        BNX2X_MCAST_CMD_DEL,
@@ -573,7 +573,8 @@ struct bnx2x_mcast_obj {
         * @param cmd command to execute (BNX2X_MCAST_CMD_X, see above)
         */
        int (*config_mcast)(struct bnx2x *bp,
-                               struct bnx2x_mcast_ramrod_params *p, int cmd);
+                           struct bnx2x_mcast_ramrod_params *p,
+                           enum bnx2x_mcast_cmd cmd);
 
        /**
         * Fills the ramrod data during the RESTORE flow.
@@ -590,11 +591,13 @@ struct bnx2x_mcast_obj {
                           int start_bin, int *rdata_idx);
 
        int (*enqueue_cmd)(struct bnx2x *bp, struct bnx2x_mcast_obj *o,
-                          struct bnx2x_mcast_ramrod_params *p, int cmd);
+                          struct bnx2x_mcast_ramrod_params *p,
+                          enum bnx2x_mcast_cmd cmd);
 
        void (*set_one_rule)(struct bnx2x *bp,
                             struct bnx2x_mcast_obj *o, int idx,
-                            union bnx2x_mcast_config_data *cfg_data, int cmd);
+                            union bnx2x_mcast_config_data *cfg_data,
+                            enum bnx2x_mcast_cmd cmd);
 
        /** Checks if there are more mcast MACs to be set or a previous
         *  command is still pending.
@@ -617,7 +620,8 @@ struct bnx2x_mcast_obj {
         * feasible.
         */
        int (*validate)(struct bnx2x *bp,
-                       struct bnx2x_mcast_ramrod_params *p, int cmd);
+                       struct bnx2x_mcast_ramrod_params *p,
+                       enum bnx2x_mcast_cmd cmd);
 
        /**
         * Restore the values of internal counters in case of a failure.
@@ -1347,7 +1351,8 @@ void bnx2x_init_mcast_obj(struct bnx2x *bp,
  *         completions.
  */
 int bnx2x_config_mcast(struct bnx2x *bp,
-                      struct bnx2x_mcast_ramrod_params *p, int cmd);
+                      struct bnx2x_mcast_ramrod_params *p,
+                      enum bnx2x_mcast_cmd cmd);
 
 /****************** CREDIT POOL ****************/
 void bnx2x_init_mac_credit_pool(struct bnx2x *bp,
index 1069669f241dc3929381d87d6c4c9dca78d73991..4397f8b76f2ea79e23bbe730329e488ded73f749 100644 (file)
@@ -1010,8 +1010,8 @@ static int bnx2x_storm_stats_update(struct bnx2x *bp)
                UPDATE_EXTEND_TSTAT(rcv_bcast_pkts,
                                        total_broadcast_packets_received);
                UPDATE_EXTEND_E_TSTAT(pkts_too_big_discard,
-                                     etherstatsoverrsizepkts);
-               UPDATE_EXTEND_E_TSTAT(no_buff_discard, no_buff_discard);
+                                     etherstatsoverrsizepkts, 32);
+               UPDATE_EXTEND_E_TSTAT(no_buff_discard, no_buff_discard, 16);
 
                SUB_EXTEND_USTAT(ucast_no_buff_pkts,
                                        total_unicast_packets_received);
@@ -1090,15 +1090,15 @@ static int bnx2x_storm_stats_update(struct bnx2x *bp)
               estats->total_bytes_received_lo,
               estats->rx_stat_ifhcinbadoctets_lo);
 
-       ADD_64(estats->total_bytes_received_hi,
-              le32_to_cpu(tfunc->rcv_error_bytes.hi),
-              estats->total_bytes_received_lo,
-              le32_to_cpu(tfunc->rcv_error_bytes.lo));
+       ADD_64_LE(estats->total_bytes_received_hi,
+                 tfunc->rcv_error_bytes.hi,
+                 estats->total_bytes_received_lo,
+                 tfunc->rcv_error_bytes.lo);
 
-       ADD_64(estats->error_bytes_received_hi,
-              le32_to_cpu(tfunc->rcv_error_bytes.hi),
-              estats->error_bytes_received_lo,
-              le32_to_cpu(tfunc->rcv_error_bytes.lo));
+       ADD_64_LE(estats->error_bytes_received_hi,
+                 tfunc->rcv_error_bytes.hi,
+                 estats->error_bytes_received_lo,
+                 tfunc->rcv_error_bytes.lo);
 
        UPDATE_ESTAT(etherstatsoverrsizepkts, rx_stat_dot3statsframestoolong);
 
index 63a2f852b4209730c6ac3a4605fef79658ee0213..364e37ecbc5cc013573ab63f5e1125f1e8cd750e 100644 (file)
@@ -421,16 +421,19 @@ struct bnx2x_fw_port_stats_old {
                              new->s); \
        } while (0)
 
-#define UPDATE_EXTEND_TSTAT(s, t) \
+#define UPDATE_EXTEND_TSTAT_X(s, t, size) \
        do { \
-               diff = le32_to_cpu(tclient->s) - le32_to_cpu(old_tclient->s); \
+               diff = le##size##_to_cpu(tclient->s) - \
+                      le##size##_to_cpu(old_tclient->s); \
                old_tclient->s = tclient->s; \
                ADD_EXTEND_64(qstats->t##_hi, qstats->t##_lo, diff); \
        } while (0)
 
-#define UPDATE_EXTEND_E_TSTAT(s, t) \
+#define UPDATE_EXTEND_TSTAT(s, t) UPDATE_EXTEND_TSTAT_X(s, t, 32)
+
+#define UPDATE_EXTEND_E_TSTAT(s, t, size) \
        do { \
-               UPDATE_EXTEND_TSTAT(s, t); \
+               UPDATE_EXTEND_TSTAT_X(s, t, size); \
                ADD_EXTEND_64(estats->t##_hi, estats->t##_lo, diff); \
        } while (0)