RDMA/hns: Update some fields of qp context

The hip08 hardware has two version. the version id are 0x20 and 0x21
according to the pci revision. It needs to adjust some fields for
extending new features. The specific updates include:

1. Add some fields for supporting new features by enabling some reserved
   fields in 0x20 version.
2. remove some fields which the user is not visiable in order to support
   the extend features.
3. Init some fields with zero.

These updates is compatible with 0x20 version.

Signed-off-by: Lijun Ou <oulijun@huawei.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index 5c9461d..c7d5353 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -2670,21 +2670,16 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,
        roce_set_bit(qpc_mask->byte_56_dqpn_err, V2_QPC_BYTE_56_RQ_TX_ERR_S, 0);
        roce_set_bit(qpc_mask->byte_56_dqpn_err, V2_QPC_BYTE_56_RQ_RX_ERR_S, 0);
 
-       roce_set_field(qpc_mask->byte_60_qpst_mapid, V2_QPC_BYTE_60_MAPID_M,
-                      V2_QPC_BYTE_60_MAPID_S, 0);
+       roce_set_field(qpc_mask->byte_60_qpst_tempid, V2_QPC_BYTE_60_TEMPID_M,
+                      V2_QPC_BYTE_60_TEMPID_S, 0);
 
-       roce_set_bit(qpc_mask->byte_60_qpst_mapid,
-                    V2_QPC_BYTE_60_INNER_MAP_IND_S, 0);
-       roce_set_bit(qpc_mask->byte_60_qpst_mapid, V2_QPC_BYTE_60_SQ_MAP_IND_S,
-                    0);
-       roce_set_bit(qpc_mask->byte_60_qpst_mapid, V2_QPC_BYTE_60_RQ_MAP_IND_S,
-                    0);
-       roce_set_bit(qpc_mask->byte_60_qpst_mapid, V2_QPC_BYTE_60_EXT_MAP_IND_S,
-                    0);
-       roce_set_bit(qpc_mask->byte_60_qpst_mapid, V2_QPC_BYTE_60_SQ_RLS_IND_S,
-                    0);
-       roce_set_bit(qpc_mask->byte_60_qpst_mapid, V2_QPC_BYTE_60_SQ_EXT_IND_S,
-                    0);
+       roce_set_field(qpc_mask->byte_60_qpst_tempid,
+                      V2_QPC_BYTE_60_SCC_TOKEN_M, V2_QPC_BYTE_60_SCC_TOKEN_S,
+                      0);
+       roce_set_bit(qpc_mask->byte_60_qpst_tempid,
+                    V2_QPC_BYTE_60_SQ_DB_DOING_S, 0);
+       roce_set_bit(qpc_mask->byte_60_qpst_tempid,
+                    V2_QPC_BYTE_60_RQ_DB_DOING_S, 0);
        roce_set_bit(qpc_mask->byte_28_at_fl, V2_QPC_BYTE_28_CNP_TX_FLAG_S, 0);
        roce_set_bit(qpc_mask->byte_28_at_fl, V2_QPC_BYTE_28_CE_FLAG_S, 0);
 
@@ -2766,7 +2761,8 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,
        roce_set_field(qpc_mask->byte_132_trrl, V2_QPC_BYTE_132_TRRL_TAIL_MAX_M,
                       V2_QPC_BYTE_132_TRRL_TAIL_MAX_S, 0);
 
-       roce_set_bit(qpc_mask->byte_140_raq, V2_QPC_BYTE_140_RSVD_RAQ_MAP_S, 0);
+       roce_set_bit(qpc_mask->byte_140_raq, V2_QPC_BYTE_140_RQ_RTY_WAIT_DO_S,
+                    0);
        roce_set_field(qpc_mask->byte_140_raq, V2_QPC_BYTE_140_RAQ_TRRL_HEAD_M,
                       V2_QPC_BYTE_140_RAQ_TRRL_HEAD_S, 0);
        roce_set_field(qpc_mask->byte_140_raq, V2_QPC_BYTE_140_RAQ_TRRL_TAIL_M,
@@ -2775,8 +2771,6 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,
        roce_set_field(qpc_mask->byte_144_raq,
                       V2_QPC_BYTE_144_RAQ_RTY_INI_PSN_M,
                       V2_QPC_BYTE_144_RAQ_RTY_INI_PSN_S, 0);
-       roce_set_bit(qpc_mask->byte_144_raq, V2_QPC_BYTE_144_RAQ_RTY_INI_IND_S,
-                    0);
        roce_set_field(qpc_mask->byte_144_raq, V2_QPC_BYTE_144_RAQ_CREDIT_M,
                       V2_QPC_BYTE_144_RAQ_CREDIT_S, 0);
        roce_set_bit(qpc_mask->byte_144_raq, V2_QPC_BYTE_144_RESP_RTY_FLG_S, 0);
@@ -2802,14 +2796,12 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,
                       V2_QPC_BYTE_160_SQ_CONSUMER_IDX_M,
                       V2_QPC_BYTE_160_SQ_CONSUMER_IDX_S, 0);
 
-       roce_set_field(context->byte_168_irrl_idx,
-                      V2_QPC_BYTE_168_SQ_SHIFT_BAK_M,
-                      V2_QPC_BYTE_168_SQ_SHIFT_BAK_S,
-                      ilog2((unsigned int)hr_qp->sq.wqe_cnt));
-       roce_set_field(qpc_mask->byte_168_irrl_idx,
-                      V2_QPC_BYTE_168_SQ_SHIFT_BAK_M,
-                      V2_QPC_BYTE_168_SQ_SHIFT_BAK_S, 0);
-
+       roce_set_bit(qpc_mask->byte_168_irrl_idx,
+                    V2_QPC_BYTE_168_POLL_DB_WAIT_DO_S, 0);
+       roce_set_bit(qpc_mask->byte_168_irrl_idx,
+                    V2_QPC_BYTE_168_SCC_TOKEN_FORBID_SQ_DEQ_S, 0);
+       roce_set_bit(qpc_mask->byte_168_irrl_idx,
+                    V2_QPC_BYTE_168_WAIT_ACK_TIMEOUT_S, 0);
        roce_set_bit(qpc_mask->byte_168_irrl_idx,
                     V2_QPC_BYTE_168_MSG_RTY_LP_FLG_S, 0);
        roce_set_bit(qpc_mask->byte_168_irrl_idx,
@@ -2871,6 +2863,13 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,
                       V2_QPC_BYTE_232_IRRL_SGE_IDX_M,
                       V2_QPC_BYTE_232_IRRL_SGE_IDX_S, 0);
 
+       roce_set_bit(qpc_mask->byte_232_irrl_sge, V2_QPC_BYTE_232_SO_LP_VLD_S,
+                    0);
+       roce_set_bit(qpc_mask->byte_232_irrl_sge,
+                    V2_QPC_BYTE_232_FENCE_LP_VLD_S, 0);
+       roce_set_bit(qpc_mask->byte_232_irrl_sge, V2_QPC_BYTE_232_IRRL_LP_VLD_S,
+                    0);
+
        qpc_mask->irrl_cur_sge_offset = 0;
 
        roce_set_field(qpc_mask->byte_240_irrl_tail,
@@ -3036,13 +3035,6 @@ static void modify_qp_init_to_init(struct ib_qp *ibqp,
                roce_set_field(qpc_mask->byte_56_dqpn_err,
                               V2_QPC_BYTE_56_DQPN_M, V2_QPC_BYTE_56_DQPN_S, 0);
        }
-       roce_set_field(context->byte_168_irrl_idx,
-                      V2_QPC_BYTE_168_SQ_SHIFT_BAK_M,
-                      V2_QPC_BYTE_168_SQ_SHIFT_BAK_S,
-                      ilog2((unsigned int)hr_qp->sq.wqe_cnt));
-       roce_set_field(qpc_mask->byte_168_irrl_idx,
-                      V2_QPC_BYTE_168_SQ_SHIFT_BAK_M,
-                      V2_QPC_BYTE_168_SQ_SHIFT_BAK_S, 0);
 }
 
 static int modify_qp_init_to_rtr(struct ib_qp *ibqp,
@@ -3352,13 +3344,6 @@ static int modify_qp_rtr_to_rts(struct ib_qp *ibqp,
         * we should set all bits of the relevant fields in context mask to
         * 0 at the same time, else set them to 0x1.
         */
-       roce_set_field(context->byte_60_qpst_mapid,
-                      V2_QPC_BYTE_60_RTY_NUM_INI_BAK_M,
-                      V2_QPC_BYTE_60_RTY_NUM_INI_BAK_S, attr->retry_cnt);
-       roce_set_field(qpc_mask->byte_60_qpst_mapid,
-                      V2_QPC_BYTE_60_RTY_NUM_INI_BAK_M,
-                      V2_QPC_BYTE_60_RTY_NUM_INI_BAK_S, 0);
-
        context->sq_cur_blk_addr = (u32)(mtts[0] >> PAGE_ADDR_SHIFT);
        roce_set_field(context->byte_168_irrl_idx,
                       V2_QPC_BYTE_168_SQ_CUR_BLK_ADDR_M,
@@ -3694,9 +3679,9 @@ static int hns_roce_v2_modify_qp(struct ib_qp *ibqp,
                set_access_flags(hr_qp, context, qpc_mask, attr, attr_mask);
 
        /* Every status migrate must change state */
-       roce_set_field(context->byte_60_qpst_mapid, V2_QPC_BYTE_60_QP_ST_M,
+       roce_set_field(context->byte_60_qpst_tempid, V2_QPC_BYTE_60_QP_ST_M,
                       V2_QPC_BYTE_60_QP_ST_S, new_state);
-       roce_set_field(qpc_mask->byte_60_qpst_mapid, V2_QPC_BYTE_60_QP_ST_M,
+       roce_set_field(qpc_mask->byte_60_qpst_tempid, V2_QPC_BYTE_60_QP_ST_M,
                       V2_QPC_BYTE_60_QP_ST_S, 0);
 
        /* SW pass context to HW */
@@ -3816,7 +3801,7 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,
                goto out;
        }
 
-       state = roce_get_field(context->byte_60_qpst_mapid,
+       state = roce_get_field(context->byte_60_qpst_tempid,
                               V2_QPC_BYTE_60_QP_ST_M, V2_QPC_BYTE_60_QP_ST_S);
        tmp_qp_state = to_ib_qp_st((enum hns_roce_v2_qp_state)state);
        if (tmp_qp_state == -1) {

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
index 7f39b94..c399ac3 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
@@ -354,7 +354,7 @@ struct hns_roce_v2_qp_context {
        __le32  dmac;
        __le32  byte_52_udpspn_dmac;
        __le32  byte_56_dqpn_err;
-       __le32  byte_60_qpst_mapid;
+       __le32  byte_60_qpst_tempid;
        __le32  qkey_xrcd;
        __le32  byte_68_rq_db;
        __le32  rq_db_record_addr;
@@ -496,26 +496,15 @@ struct hns_roce_v2_qp_context {
 #define        V2_QPC_BYTE_56_LP_PKTN_INI_S 28
 #define V2_QPC_BYTE_56_LP_PKTN_INI_M GENMASK(31, 28)
 
-#define        V2_QPC_BYTE_60_MAPID_S 0
-#define V2_QPC_BYTE_60_MAPID_M GENMASK(12, 0)
+#define        V2_QPC_BYTE_60_TEMPID_S 0
+#define V2_QPC_BYTE_60_TEMPID_M GENMASK(7, 0)
 
-#define        V2_QPC_BYTE_60_INNER_MAP_IND_S 13
+#define V2_QPC_BYTE_60_SCC_TOKEN_S 8
+#define V2_QPC_BYTE_60_SCC_TOKEN_M GENMASK(26, 8)
 
-#define        V2_QPC_BYTE_60_SQ_MAP_IND_S 14
+#define        V2_QPC_BYTE_60_SQ_DB_DOING_S 27
 
-#define        V2_QPC_BYTE_60_RQ_MAP_IND_S 15
-
-#define        V2_QPC_BYTE_60_TEMPID_S 16
-#define V2_QPC_BYTE_60_TEMPID_M  GENMASK(22, 16)
-
-#define        V2_QPC_BYTE_60_EXT_MAP_IND_S 23
-
-#define        V2_QPC_BYTE_60_RTY_NUM_INI_BAK_S 24
-#define V2_QPC_BYTE_60_RTY_NUM_INI_BAK_M GENMASK(26, 24)
-
-#define V2_QPC_BYTE_60_SQ_RLS_IND_S 27
-
-#define        V2_QPC_BYTE_60_SQ_EXT_IND_S 28
+#define        V2_QPC_BYTE_60_RQ_DB_DOING_S 28
 
 #define        V2_QPC_BYTE_60_QP_ST_S 29
 #define V2_QPC_BYTE_60_QP_ST_M GENMASK(31, 29)
@@ -592,7 +581,7 @@ struct hns_roce_v2_qp_context {
 #define        V2_QPC_BYTE_140_RR_MAX_S 12
 #define V2_QPC_BYTE_140_RR_MAX_M GENMASK(14, 12)
 
-#define        V2_QPC_BYTE_140_RSVD_RAQ_MAP_S 15
+#define        V2_QPC_BYTE_140_RQ_RTY_WAIT_DO_S 15
 
 #define        V2_QPC_BYTE_140_RAQ_TRRL_HEAD_S 16
 #define V2_QPC_BYTE_140_RAQ_TRRL_HEAD_M GENMASK(23, 16)
@@ -603,8 +592,6 @@ struct hns_roce_v2_qp_context {
 #define        V2_QPC_BYTE_144_RAQ_RTY_INI_PSN_S 0
 #define V2_QPC_BYTE_144_RAQ_RTY_INI_PSN_M GENMASK(23, 0)
 
-#define V2_QPC_BYTE_144_RAQ_RTY_INI_IND_S 24
-
 #define V2_QPC_BYTE_144_RAQ_CREDIT_S 25
 #define V2_QPC_BYTE_144_RAQ_CREDIT_M GENMASK(29, 25)
 
@@ -641,9 +628,9 @@ struct hns_roce_v2_qp_context {
 #define        V2_QPC_BYTE_168_LP_SGEN_INI_S 22
 #define V2_QPC_BYTE_168_LP_SGEN_INI_M GENMASK(23, 22)
 
-#define        V2_QPC_BYTE_168_SQ_SHIFT_BAK_S 24
-#define V2_QPC_BYTE_168_SQ_SHIFT_BAK_M GENMASK(27, 24)
-
+#define V2_QPC_BYTE_168_POLL_DB_WAIT_DO_S 25
+#define V2_QPC_BYTE_168_SCC_TOKEN_FORBID_SQ_DEQ_S 26
+#define V2_QPC_BYTE_168_WAIT_ACK_TIMEOUT_S 27
 #define        V2_QPC_BYTE_168_IRRL_IDX_LSB_S 28
 #define V2_QPC_BYTE_168_IRRL_IDX_LSB_M GENMASK(31, 28)
 
@@ -729,6 +716,10 @@ struct hns_roce_v2_qp_context {
 #define        V2_QPC_BYTE_232_IRRL_SGE_IDX_S 20
 #define V2_QPC_BYTE_232_IRRL_SGE_IDX_M GENMASK(28, 20)
 
+#define V2_QPC_BYTE_232_SO_LP_VLD_S 29
+#define V2_QPC_BYTE_232_FENCE_LP_VLD_S 30
+#define V2_QPC_BYTE_232_IRRL_LP_VLD_S 31
+
 #define        V2_QPC_BYTE_240_IRRL_TAIL_REAL_S 0
 #define V2_QPC_BYTE_240_IRRL_TAIL_REAL_M GENMASK(7, 0)
 
@@ -747,6 +738,9 @@ struct hns_roce_v2_qp_context {
 #define        V2_QPC_BYTE_244_RNR_CNT_S 27
 #define V2_QPC_BYTE_244_RNR_CNT_M GENMASK(29, 27)
 
+#define V2_QPC_BYTE_244_LCL_OP_FLG_S 30
+#define V2_QPC_BYTE_244_IRRL_RD_FLG_S 31
+
 #define        V2_QPC_BYTE_248_IRRL_PSN_S 0
 #define V2_QPC_BYTE_248_IRRL_PSN_M GENMASK(23, 0)