Merge tag 'mmc-v5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[linux-2.6-microblaze.git] / drivers / infiniband / hw / hns / hns_roce_hw_v2.h

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
index 04b4ad4..b8a09d4 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
@@ -700,6 +700,7 @@ struct hns_roce_v2_qp_context {
 #define QPCEX_CONG_ALG_SUB_SEL QPCEX_FIELD_LOC(1, 1)
 #define QPCEX_DIP_CTX_IDX_VLD QPCEX_FIELD_LOC(2, 2)
 #define QPCEX_DIP_CTX_IDX QPCEX_FIELD_LOC(22, 3)
+#define QPCEX_SQ_RQ_NOT_FORBID_EN QPCEX_FIELD_LOC(23, 23)
 #define QPCEX_STASH QPCEX_FIELD_LOC(82, 82)
 
 #define        V2_QP_RWE_S 1 /* rdma write enable */
@@ -1337,6 +1338,7 @@ struct hns_roce_congestion_algorithm {
        u8 alg_sel;
        u8 alg_sub_sel;
        u8 dip_vld;
+       u8 wnd_mode_sel;
 };
 
 #define V2_QUERY_PF_CAPS_D_CEQ_DEPTH_S 0
@@ -1443,21 +1445,6 @@ struct hns_roce_v2_priv {
        struct hns_roce_link_table ext_llm;
 };
 
-struct hns_roce_eq_context {
-       __le32  byte_4;
-       __le32  byte_8;
-       __le32  byte_12;
-       __le32  eqe_report_timer;
-       __le32  eqe_ba0;
-       __le32  eqe_ba1;
-       __le32  byte_28;
-       __le32  byte_32;
-       __le32  byte_36;
-       __le32  byte_40;
-       __le32  byte_44;
-       __le32  rsv[5];
-};
-
 struct hns_roce_dip {
        u8 dgid[GID_LEN_V2];
        u8 dip_idx;
@@ -1519,6 +1506,10 @@ struct hns_roce_dip {
 #define HNS_ROCE_V2_VF_ABN_INT_CFG_M GENMASK(2, 0)
 #define HNS_ROCE_V2_VF_EVENT_INT_EN_M GENMASK(0, 0)
 
+struct hns_roce_eq_context {
+       __le32  data[16];
+};
+
 #define EQC_FIELD_LOC(h, l) FIELD_LOC(struct hns_roce_eq_context, h, l)
 
 #define EQC_EQ_ST EQC_FIELD_LOC(1, 0)