RDMA/hns: Remove VF extend configuration

Remove VF extend configuration since the relative registers are
configured in firmware currently.

Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
Link: https://lore.kernel.org/r/20230721025146.450831-3-huangjunxian6@hisilicon.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index 84239b907de2aeef03d3440c43d6d3404fa67ca2..6084c16490006f81cfe7d01d9841d8e878de2fb1 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -714,7 +714,6 @@ struct hns_roce_caps {
        u32             max_rq_sg;
        u32             rsv0;
        u32             num_qps;
-       u32             num_pi_qps;
        u32             reserved_qps;
        u32             num_srqs;
        u32             max_wqes;

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index 8427e8d319b7fdba86bb4ffca8415e1180ea523d..30451cef5376e7cdd437d0f9ba7aaf5fe26e1697 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -1680,29 +1680,6 @@ static int load_func_res_caps(struct hns_roce_dev *hr_dev, bool is_vf)
        return 0;
 }
 
-static int load_ext_cfg_caps(struct hns_roce_dev *hr_dev, bool is_vf)
-{
-       struct hns_roce_cmq_desc desc;
-       struct hns_roce_cmq_req *req = (struct hns_roce_cmq_req *)desc.data;
-       struct hns_roce_caps *caps = &hr_dev->caps;
-       u32 func_num, qp_num;
-       int ret;
-
-       hns_roce_cmq_setup_basic_desc(&desc, HNS_ROCE_OPC_EXT_CFG, true);
-       ret = hns_roce_cmq_send(hr_dev, &desc, 1);
-       if (ret)
-               return ret;
-
-       func_num = is_vf ? 1 : max_t(u32, 1, hr_dev->func_num);
-       qp_num = hr_reg_read(req, EXT_CFG_QP_PI_NUM) / func_num;
-       caps->num_pi_qps = round_down(qp_num, HNS_ROCE_QP_BANK_NUM);
-
-       qp_num = hr_reg_read(req, EXT_CFG_QP_NUM) / func_num;
-       caps->num_qps = round_down(qp_num, HNS_ROCE_QP_BANK_NUM);
-
-       return 0;
-}
-
 static int load_pf_timer_res_caps(struct hns_roce_dev *hr_dev)
 {
        struct hns_roce_cmq_desc desc;
@@ -1723,50 +1700,37 @@ static int load_pf_timer_res_caps(struct hns_roce_dev *hr_dev)
        return 0;
 }
 
-static int query_func_resource_caps(struct hns_roce_dev *hr_dev, bool is_vf)
+static int hns_roce_query_pf_resource(struct hns_roce_dev *hr_dev)
 {
        struct device *dev = hr_dev->dev;
        int ret;
 
-       ret = load_func_res_caps(hr_dev, is_vf);
+       ret = load_func_res_caps(hr_dev, false);
        if (ret) {
-               dev_err(dev, "failed to load res caps, ret = %d (%s).\n", ret,
-                       is_vf ? "vf" : "pf");
+               dev_err(dev, "failed to load pf res caps, ret = %d.\n", ret);
                return ret;
        }
 
-       if (hr_dev->pci_dev->revision >= PCI_REVISION_ID_HIP09) {
-               ret = load_ext_cfg_caps(hr_dev, is_vf);
-               if (ret)
-                       dev_err(dev, "failed to load ext cfg, ret = %d (%s).\n",
-                               ret, is_vf ? "vf" : "pf");
-       }
+       ret = load_pf_timer_res_caps(hr_dev);
+       if (ret)
+               dev_err(dev, "failed to load pf timer resource, ret = %d.\n",
+                       ret);
 
        return ret;
 }
 
-static int hns_roce_query_pf_resource(struct hns_roce_dev *hr_dev)
+static int hns_roce_query_vf_resource(struct hns_roce_dev *hr_dev)
 {
        struct device *dev = hr_dev->dev;
        int ret;
 
-       ret = query_func_resource_caps(hr_dev, false);
+       ret = load_func_res_caps(hr_dev, true);
        if (ret)
-               return ret;
-
-       ret = load_pf_timer_res_caps(hr_dev);
-       if (ret)
-               dev_err(dev, "failed to load pf timer resource, ret = %d.\n",
-                       ret);
+               dev_err(dev, "failed to load vf res caps, ret = %d.\n", ret);
 
        return ret;
 }
 
-static int hns_roce_query_vf_resource(struct hns_roce_dev *hr_dev)
-{
-       return query_func_resource_caps(hr_dev, true);
-}
-
 static int __hns_roce_set_vf_switch_param(struct hns_roce_dev *hr_dev,
                                          u32 vf_id)
 {
@@ -1849,24 +1813,6 @@ static int config_vf_hem_resource(struct hns_roce_dev *hr_dev, int vf_id)
        return hns_roce_cmq_send(hr_dev, desc, 2);
 }
 
-static int config_vf_ext_resource(struct hns_roce_dev *hr_dev, u32 vf_id)
-{
-       struct hns_roce_cmq_desc desc;
-       struct hns_roce_cmq_req *req = (struct hns_roce_cmq_req *)desc.data;
-       struct hns_roce_caps *caps = &hr_dev->caps;
-
-       hns_roce_cmq_setup_basic_desc(&desc, HNS_ROCE_OPC_EXT_CFG, false);
-
-       hr_reg_write(req, EXT_CFG_VF_ID, vf_id);
-
-       hr_reg_write(req, EXT_CFG_QP_PI_NUM, caps->num_pi_qps);
-       hr_reg_write(req, EXT_CFG_QP_PI_IDX, vf_id * caps->num_pi_qps);
-       hr_reg_write(req, EXT_CFG_QP_NUM, caps->num_qps);
-       hr_reg_write(req, EXT_CFG_QP_IDX, vf_id * caps->num_qps);
-
-       return hns_roce_cmq_send(hr_dev, &desc, 1);
-}
-
 static int hns_roce_alloc_vf_resource(struct hns_roce_dev *hr_dev)
 {
        u32 func_num = max_t(u32, 1, hr_dev->func_num);
@@ -1881,16 +1827,6 @@ static int hns_roce_alloc_vf_resource(struct hns_roce_dev *hr_dev)
                                vf_id, ret);
                        return ret;
                }
-
-               if (hr_dev->pci_dev->revision >= PCI_REVISION_ID_HIP09) {
-                       ret = config_vf_ext_resource(hr_dev, vf_id);
-                       if (ret) {
-                               dev_err(hr_dev->dev,
-                                       "failed to config vf-%u ext res, ret = %d.\n",
-                                       vf_id, ret);
-                               return ret;
-                       }
-               }
        }
 
        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 2b87f0cf06ec8b851c8bdd55547f7c9df5d53f16..d9693f6cc802f6d33ce94a93773293083fdd6ae8 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
@@ -219,7 +219,6 @@ enum hns_roce_opcode_type {
        HNS_ROCE_OPC_QUERY_VF_RES                       = 0x850e,
        HNS_ROCE_OPC_CFG_GMV_TBL                        = 0x850f,
        HNS_ROCE_OPC_CFG_GMV_BT                         = 0x8510,
-       HNS_ROCE_OPC_EXT_CFG                            = 0x8512,
        HNS_ROCE_QUERY_RAM_ECC                          = 0x8513,
        HNS_SWITCH_PARAMETER_CFG                        = 0x1033,
 };
@@ -956,15 +955,6 @@ struct hns_roce_func_clear {
 #define HNS_ROCE_V2_READ_FUNC_CLEAR_FLAG_INTERVAL      40
 #define HNS_ROCE_V2_READ_FUNC_CLEAR_FLAG_FAIL_WAIT     20
 
-/* Fields of HNS_ROCE_OPC_EXT_CFG */
-#define EXT_CFG_VF_ID CMQ_REQ_FIELD_LOC(31, 0)
-#define EXT_CFG_QP_PI_IDX CMQ_REQ_FIELD_LOC(45, 32)
-#define EXT_CFG_QP_PI_NUM CMQ_REQ_FIELD_LOC(63, 48)
-#define EXT_CFG_QP_NUM CMQ_REQ_FIELD_LOC(87, 64)
-#define EXT_CFG_QP_IDX CMQ_REQ_FIELD_LOC(119, 96)
-#define EXT_CFG_LLM_IDX CMQ_REQ_FIELD_LOC(139, 128)
-#define EXT_CFG_LLM_NUM CMQ_REQ_FIELD_LOC(156, 144)
-
 #define CFG_LLM_A_BA_L CMQ_REQ_FIELD_LOC(31, 0)
 #define CFG_LLM_A_BA_H CMQ_REQ_FIELD_LOC(63, 32)
 #define CFG_LLM_A_DEPTH CMQ_REQ_FIELD_LOC(76, 64)