cxgb4i/cxgb4 : Refactor macros to conform to uniform standards

Refactored all macros used in cxgb4i as part of previously started cxgb4 macro
names cleanup. Makes them more uniform and avoids namespace collision.
Minor changes in other drivers where required as some of these macros are used
 by multiple drivers, affected drivers are iw_cxgb4, cxgb4(vf) & csiostor

Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 40 insertions, 38 deletions

diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index ccacf09c2c16..ed0e16866dc7 100644
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -188,18 +188,18 @@ static void send_act_open_req(struct cxgbi_sock *csk, struct sk_buff *skb,
         unsigned int qid_atid = ((unsigned int)csk->atid) |
                                  (((unsigned int)csk->rss_qid) << 14);
 
-        opt0 = KEEP_ALIVE(1) |
-                WND_SCALE(wscale) |
-                MSS_IDX(csk->mss_idx) |
-                L2T_IDX(((struct l2t_entry *)csk->l2t)->idx) |
-                TX_CHAN(csk->tx_chan) |
-                SMAC_SEL(csk->smac_idx) |
-                ULP_MODE(ULP_MODE_ISCSI) |
-                RCV_BUFSIZ(cxgb4i_rcv_win >> 10);
-        opt2 = RX_CHANNEL(0) |
-                RSS_QUEUE_VALID |
-                (1 << 20) |
-                RSS_QUEUE(csk->rss_qid);
+        opt0 = KEEP_ALIVE_F |
+                WND_SCALE_V(wscale) |
+                MSS_IDX_V(csk->mss_idx) |
+                L2T_IDX_V(((struct l2t_entry *)csk->l2t)->idx) |
+                TX_CHAN_V(csk->tx_chan) |
+                SMAC_SEL_V(csk->smac_idx) |
+                ULP_MODE_V(ULP_MODE_ISCSI) |
+                RCV_BUFSIZ_V(cxgb4i_rcv_win >> 10);
+        opt2 = RX_CHANNEL_V(0) |
+                RSS_QUEUE_VALID_F |
+                (RX_FC_DISABLE_F) |
+                RSS_QUEUE_V(csk->rss_qid);
 
         if (is_t4(lldi->adapter_type)) {
                 struct cpl_act_open_req *req =
@@ -216,7 +216,7 @@ static void send_act_open_req(struct cxgbi_sock *csk, struct sk_buff *skb,
                 req->params = cpu_to_be32(cxgb4_select_ntuple(
                                         csk->cdev->ports[csk->port_id],
                                         csk->l2t));
-                opt2 |= 1 << 22;
+                opt2 |= RX_FC_VALID_F;
                 req->opt2 = cpu_to_be32(opt2);
 
                 log_debug(1 << CXGBI_DBG_TOE | 1 << CXGBI_DBG_SOCK,
@@ -236,7 +236,7 @@ static void send_act_open_req(struct cxgbi_sock *csk, struct sk_buff *skb,
                 req->local_ip = csk->saddr.sin_addr.s_addr;
                 req->peer_ip = csk->daddr.sin_addr.s_addr;
                 req->opt0 = cpu_to_be64(opt0);
-                req->params = cpu_to_be64(V_FILTER_TUPLE(
+                req->params = cpu_to_be64(FILTER_TUPLE_V(
                                 cxgb4_select_ntuple(
                                         csk->cdev->ports[csk->port_id],
                                         csk->l2t)));
@@ -271,19 +271,19 @@ static void send_act_open_req6(struct cxgbi_sock *csk, struct sk_buff *skb,
         unsigned int qid_atid = ((unsigned int)csk->atid) |
                                  (((unsigned int)csk->rss_qid) << 14);
 
-        opt0 = KEEP_ALIVE(1) |
-                WND_SCALE(wscale) |
-                MSS_IDX(csk->mss_idx) |
-                L2T_IDX(((struct l2t_entry *)csk->l2t)->idx) |
-                TX_CHAN(csk->tx_chan) |
-                SMAC_SEL(csk->smac_idx) |
-                ULP_MODE(ULP_MODE_ISCSI) |
-                RCV_BUFSIZ(cxgb4i_rcv_win >> 10);
+        opt0 = KEEP_ALIVE_F |
+                WND_SCALE_V(wscale) |
+                MSS_IDX_V(csk->mss_idx) |
+                L2T_IDX_V(((struct l2t_entry *)csk->l2t)->idx) |
+                TX_CHAN_V(csk->tx_chan) |
+                SMAC_SEL_V(csk->smac_idx) |
+                ULP_MODE_V(ULP_MODE_ISCSI) |
+                RCV_BUFSIZ_V(cxgb4i_rcv_win >> 10);
 
-        opt2 = RX_CHANNEL(0) |
-                RSS_QUEUE_VALID |
-                RX_FC_DISABLE |
-                RSS_QUEUE(csk->rss_qid);
+        opt2 = RX_CHANNEL_V(0) |
+                RSS_QUEUE_VALID_F |
+                RX_FC_DISABLE_F |
+                RSS_QUEUE_V(csk->rss_qid);
 
         if (t4) {
                 struct cpl_act_open_req6 *req =
@@ -304,7 +304,7 @@ static void send_act_open_req6(struct cxgbi_sock *csk, struct sk_buff *skb,
 
                 req->opt0 = cpu_to_be64(opt0);
 
-                opt2 |= RX_FC_VALID;
+                opt2 |= RX_FC_VALID_F;
                 req->opt2 = cpu_to_be32(opt2);
 
                 req->params = cpu_to_be32(cxgb4_select_ntuple(
@@ -327,10 +327,10 @@ static void send_act_open_req6(struct cxgbi_sock *csk, struct sk_buff *skb,
                                                                         8);
                 req->opt0 = cpu_to_be64(opt0);
 
-                opt2 |= T5_OPT_2_VALID;
+                opt2 |= T5_OPT_2_VALID_F;
                 req->opt2 = cpu_to_be32(opt2);
 
-                req->params = cpu_to_be64(V_FILTER_TUPLE(cxgb4_select_ntuple(
+                req->params = cpu_to_be64(FILTER_TUPLE_V(cxgb4_select_ntuple(
                                           csk->cdev->ports[csk->port_id],
                                           csk->l2t)));
         }
@@ -451,7 +451,8 @@ static u32 send_rx_credits(struct cxgbi_sock *csk, u32 credits)
         INIT_TP_WR(req, csk->tid);
         OPCODE_TID(req) = cpu_to_be32(MK_OPCODE_TID(CPL_RX_DATA_ACK,
                                       csk->tid));
-        req->credit_dack = cpu_to_be32(RX_CREDITS(credits) | RX_FORCE_ACK(1));
+        req->credit_dack = cpu_to_be32(RX_CREDITS_V(credits)
+                                       | RX_FORCE_ACK_F);
         cxgb4_ofld_send(csk->cdev->ports[csk->port_id], skb);
         return credits;
 }
@@ -1440,16 +1441,16 @@ static inline void ulp_mem_io_set_hdr(struct cxgb4_lld_info *lldi,
 
         INIT_ULPTX_WR(req, wr_len, 0, 0);
         if (is_t4(lldi->adapter_type))
-                req->cmd = htonl(ULPTX_CMD(ULP_TX_MEM_WRITE) |
-                                        (ULP_MEMIO_ORDER(1)));
+                req->cmd = htonl(ULPTX_CMD_V(ULP_TX_MEM_WRITE) |
+                                        (ULP_MEMIO_ORDER_F));
         else
-                req->cmd = htonl(ULPTX_CMD(ULP_TX_MEM_WRITE) |
-                                        (V_T5_ULP_MEMIO_IMM(1)));
-        req->dlen = htonl(ULP_MEMIO_DATA_LEN(dlen >> 5));
-        req->lock_addr = htonl(ULP_MEMIO_ADDR(pm_addr >> 5));
+                req->cmd = htonl(ULPTX_CMD_V(ULP_TX_MEM_WRITE) |
+                                        (T5_ULP_MEMIO_IMM_F));
+        req->dlen = htonl(ULP_MEMIO_DATA_LEN_V(dlen >> 5));
+        req->lock_addr = htonl(ULP_MEMIO_ADDR_V(pm_addr >> 5));
         req->len16 = htonl(DIV_ROUND_UP(wr_len - sizeof(req->wr), 16));
 
-        idata->cmd_more = htonl(ULPTX_CMD(ULP_TX_SC_IMM));
+        idata->cmd_more = htonl(ULPTX_CMD_V(ULP_TX_SC_IMM));
         idata->len = htonl(dlen);
 }
 
@@ -1673,7 +1674,8 @@ static void *t4_uld_add(const struct cxgb4_lld_info *lldi)
         cdev->skb_rx_extra = sizeof(struct cpl_iscsi_hdr);
         cdev->itp = &cxgb4i_iscsi_transport;
 
-        cdev->pfvf = FW_VIID_PFN_GET(cxgb4_port_viid(lldi->ports[0])) << 8;
+        cdev->pfvf = FW_VIID_PFN_G(cxgb4_port_viid(lldi->ports[0]))
+                        << FW_VIID_PFN_S;
         pr_info("cdev 0x%p,%s, pfvf %u.\n",
                 cdev, lldi->ports[0]->name, cdev->pfvf);