This patch registers IB device and unregister IB device when removed.

Signed-off-by: Lijun Ou <ouli...@huawei.com>
Signed-off-by: Wei Hu(Xavier) <xavier.hu...@huawei.com>
---
 drivers/infiniband/hw/hns/hns_roce_main.c | 48 +++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c 
b/drivers/infiniband/hw/hns/hns_roce_main.c
index 4c42a24..f98ba23 100644
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -43,6 +43,42 @@
 #include "hns_roce_device.h"
 #include "hns_roce_icm.h"
 
+void hns_roce_unregister_device(struct hns_roce_dev *hr_dev)
+{
+       ib_unregister_device(&hr_dev->ib_dev);
+}
+
+int hns_roce_register_device(struct hns_roce_dev *hr_dev)
+{
+       int ret;
+       struct hns_roce_ib_iboe *iboe = NULL;
+       struct ib_device *ib_dev = NULL;
+       struct device *dev = &hr_dev->pdev->dev;
+
+       iboe = &hr_dev->iboe;
+
+       ib_dev = &hr_dev->ib_dev;
+       strlcpy(ib_dev->name, "hisi_%d", IB_DEVICE_NAME_MAX);
+
+       ib_dev->owner                   = THIS_MODULE;
+       ib_dev->node_type               = RDMA_NODE_IB_CA;
+       ib_dev->dma_device              = dev;
+
+       ib_dev->phys_port_cnt           = hr_dev->caps.num_ports;
+       ib_dev->local_dma_lkey          = hr_dev->caps.reserved_lkey;
+       ib_dev->num_comp_vectors        = hr_dev->caps.num_comp_vectors;
+       ib_dev->uverbs_abi_ver          = 1;
+
+       ret = ib_register_device(ib_dev, NULL);
+       if (ret) {
+               dev_err(dev, "ib_register_device failed!\n");
+               return ret;
+       }
+
+       return 0;
+}
+
+
 int hns_roce_get_cfg(struct hns_roce_dev *hr_dev)
 {
        int i;
@@ -347,6 +383,17 @@ static int hns_roce_probe(struct platform_device *pdev)
                goto error_failed_engine_init;
        }
 
+       ret = hns_roce_register_device(hr_dev);
+       if (ret) {
+               dev_err(dev, "register_device failed!\n");
+               goto error_failed_register_device;
+       }
+
+       return 0;
+
+error_failed_register_device:
+       hns_roce_engine_uninit(hr_dev);
+
 error_failed_engine_init:
        hns_roce_cleanup_bitmap(hr_dev);
 
@@ -383,6 +430,7 @@ static int hns_roce_remove(struct platform_device *pdev)
        struct hns_roce_dev *hr_dev = platform_get_drvdata(pdev);
        int ret = 0;
 
+       hns_roce_unregister_device(hr_dev);
        hns_roce_engine_uninit(hr_dev);
        hns_roce_cleanup_bitmap(hr_dev);
        hns_roce_cleanup_icm(hr_dev);
-- 
1.9.1

Reply via email to