Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1424135

[PATCH v10 11/22] IB/hns: Add IB device registration

Show all headers | View raw

This patch registered IB device when loaded, and unregistered
IB device when removed.

Signed-off-by: Wei Hu <xavier.huwei@huawei.com>
Signed-off-by: Nenglong Zhao <zhaonenglong@hisilicon.com>
Signed-off-by: Lijun Ou <oulijun@huawei.com>
---
PATCH v9:
This fixes the comments given by Leon Romanovsky over the PATCH v8:
  Link: https://lkml.org/lkml/2016/6/9/53

PATCH v8/v7/v6:
- No change over the PATCH v5

PATCH v5:
- The initial patch which was redesigned based on the second patch
  in PATCH v4
---
---
 drivers/infiniband/hw/hns/hns_roce_main.c | 47 ++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index bb8b017..24572ec 100644
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -61,6 +61,41 @@
 #include "hns_roce_device.h"
 #include "hns_roce_icm.h"
 
+static void hns_roce_unregister_device(struct hns_roce_dev *hr_dev)
+{
+	ib_unregister_device(&hr_dev->ib_dev);
+}
+
+static 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;
+}
+
 static int hns_roce_get_cfg(struct hns_roce_dev *hr_dev)
 {
 	int i;
@@ -203,7 +238,7 @@ err_unmap_mtt:
 	return ret;
 }
 
-static int hns_roce_engine_init(struct hns_roce_dev  *hr_dev)
+static int hns_roce_engine_init(struct hns_roce_dev *hr_dev)
 {
 	return hr_dev->hw->hw_init(hr_dev);
 }
@@ -366,6 +401,15 @@ static int hns_roce_probe(struct platform_device *pdev)
 		goto error_failed_engine_init;
 	}
 
+	ret = hns_roce_register_device(hr_dev);
+	if (ret)
+		goto error_failed_register_device;
+
+	return 0;
+
+error_failed_register_device:
+	hns_roce_engine_exit(hr_dev);
+
 error_failed_engine_init:
 	hns_roce_cleanup_bitmap(hr_dev);
 
@@ -401,6 +445,7 @@ static int hns_roce_remove(struct platform_device *pdev)
 {
 	struct hns_roce_dev *hr_dev = platform_get_drvdata(pdev);
 
+	hns_roce_unregister_device(hr_dev);
 	hns_roce_engine_exit(hr_dev);
 	hns_roce_cleanup_bitmap(hr_dev);
 	hns_roce_cleanup_icm(hr_dev);
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v10 00/22] Add HiSilicon RoCE driver Lijun Ou <oulijun@huawei.com> - 2016-06-16 16:40 +0200
  [PATCH v10 16/22] IB/hns: Add ah operations support Lijun Ou <oulijun@huawei.com> - 2016-06-16 16:40 +0200
  [PATCH v10 06/22] IB/hns: Add initial cmd operation Lijun Ou <oulijun@huawei.com> - 2016-06-16 16:40 +0200
    Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation Leon Romanovsky <leon@kernel.org> - 2016-06-20 15:40 +0200
      Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation "Wei Hu (Xavier)" <xavier.huwei@huawei.com> - 2016-06-21 13:00 +0200
        Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation Leon Romanovsky <leon@kernel.org> - 2016-06-21 13:40 +0200
          Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation "Wei Hu (Xavier)" <xavier.huwei@huawei.com> - 2016-06-21 15:10 +0200
            Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation Leon Romanovsky <leon@kernel.org> - 2016-06-22 07:00 +0200
              Re: [PATCH v10 06/22] IB/hns: Add initial cmd operation "Wei Hu (Xavier)" <xavier.huwei@huawei.com> - 2016-06-22 09:00 +0200
  [PATCH v10 05/22] IB/hns: Add initial profile resource Lijun Ou <oulijun@huawei.com> - 2016-06-16 16:40 +0200
  [PATCH v10 11/22] IB/hns: Add IB device registration Lijun Ou <oulijun@huawei.com> - 2016-06-16 16:40 +0200
  [PATCH v10 10/22] IB/hns: Add process flow to init RoCE engine Lijun Ou <oulijun@huawei.com> - 2016-06-16 16:40 +0200
  [PATCH v10 12/22] IB/hns: Set mtu and gid support Lijun Ou <oulijun@huawei.com> - 2016-06-16 16:40 +0200

csiph-web