RDMA/hns: Remove the some magic number

Here uses the meaningful macro instead of the magic number
for readability.

Signed-off-by: Lijun Ou <oulijun@huawei.com>
Signed-off-by: Lang Chen <chenglang@huawei.com>
Link: https://lore.kernel.org/r/1566393276-42555-5-git-send-email-oulijun@huawei.com
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index 011e0384b56e736b66112c91c7e6aecef494156a..5eb7134f2fcedcfdeb47641bc79e526085b981ba 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -127,6 +127,11 @@
 #define HNS_ROCE_IDX_QUE_ENTRY_SZ              4
 #define SRQ_DB_REG                             0x230
 
+/* The chip implementation of the consumer index is calculated
+ * according to twice the actual EQ depth
+ */
+#define EQ_DEPTH_COEFF                         2
+
 enum {
        HNS_ROCE_SUPPORT_RQ_RECORD_DB = 1 << 0,
        HNS_ROCE_SUPPORT_SQ_RECORD_DB = 1 << 1,

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
index e687b439269eeed6fde7d734cab8760b0e06370d..3fcd0bdc79dd273af52a5bcec7df92d7f5956eb8 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v1.c
@@ -4018,7 +4018,8 @@ static int hns_roce_v1_ceq_int(struct hns_roce_dev *hr_dev,
                ++eq->cons_index;
                ceqes_found = 1;
 
-               if (eq->cons_index > 2 * hr_dev->caps.ceqe_depth - 1) {
+               if (eq->cons_index >
+                   EQ_DEPTH_COEFF * hr_dev->caps.ceqe_depth - 1) {
                        dev_warn(&eq->hr_dev->pdev->dev,
                                "cons_index overflow, set back to 0.\n");
                        eq->cons_index = 0;

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index 67e56b88577150c16985026437a8ab5384330815..d4c4c4157085517cf1d907f7eedd7a573d667475 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -5084,7 +5084,7 @@ static int hns_roce_v2_ceq_int(struct hns_roce_dev *hr_dev,
                ++eq->cons_index;
                ceqe_found = 1;
 
-               if (eq->cons_index > (2 * eq->entries - 1)) {
+               if (eq->cons_index > (EQ_DEPTH_COEFF * eq->entries - 1)) {
                        dev_warn(dev, "cons_index overflow, set back to 0.\n");
                        eq->cons_index = 0;
                }
@@ -6501,7 +6501,7 @@ static int hns_roce_hw_v2_reset_notify_uninit(struct hnae3_handle *handle)
 
        handle->rinfo.reset_state = HNS_ROCE_STATE_RST_UNINIT;
        dev_info(&handle->pdev->dev, "In reset process RoCE client uninit.\n");
-       msleep(100);
+       msleep(HNS_ROCE_V2_HW_RST_UNINT_DELAY);
        __hns_roce_hw_v2_uninit_instance(handle, false);
 
        return 0;

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
index 58931b5399f89f385ec8e83ccd1416cf1b2e20f9..1301629769edc51eaee09c453d057b5b5a18feb6 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
@@ -96,7 +96,8 @@
 #define HNS_ROCE_V2_UC_RC_SGE_NUM_IN_WQE       2
 #define HNS_ROCE_V2_RSV_QPS                    8
 
-#define HNS_ROCE_V2_HW_RST_TIMEOUT             1000
+#define HNS_ROCE_V2_HW_RST_TIMEOUT             1000
+#define HNS_ROCE_V2_HW_RST_UNINT_DELAY         100
 
 #define HNS_ROCE_CONTEXT_HOP_NUM               1
 #define HNS_ROCE_SCCC_HOP_NUM                  1