From: Lijun Ou <oulijun@huawei.com>
To: <dledford@redhat.com>, <sean.hefty@intel.com>,
<hal.rosenstock@gmail.com>, <davem@davemloft.net>,
<jeffrey.t.kirsher@intel.com>, <jiri@mellanox.com>,
<ogerlitz@mellanox.com>
Cc: <linux-rdma@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<netdev@vger.kernel.org>, <gongyangming@huawei.com>,
<xiaokun@huawei.com>, <tangchaofei@huawei.com>,
<oulijun@huawei.com>, <haifeng.wei@huawei.com>,
<yisen.zhuang@huawei.com>, <yankejian@huawei.com>,
<charles.chenxin@huawei.com>, <linuxarm@huawei.com>
Subject: [PATCH v6 11/21] IB/hns: Add IB device registration
Date: Thu, 28 Apr 2016 20:09:46 +0800 [thread overview]
Message-ID: <1461845396-61306-12-git-send-email-oulijun@huawei.com> (raw)
In-Reply-To: <1461845396-61306-1-git-send-email-oulijun@huawei.com>
This patch registered IB device 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>
---
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 64c6b89..b26509b 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;
@@ -348,6 +384,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);
+ 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
next prev parent reply other threads:[~2016-04-28 12:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-28 12:09 [PATCH v6 00/21] Add HiSilicon RoCE driver Lijun Ou
2016-04-28 12:09 ` [PATCH v6 01/21] net: hns: Add reset function support for " Lijun Ou
2016-04-28 12:09 ` [PATCH v6 02/21] devicetree: bindings: IB: Add binding document for HiSilicon RoCE Lijun Ou
2016-04-28 12:09 ` [PATCH v6 03/21] IB/hns: Add initial main frame driver and get cfg info Lijun Ou
2016-04-28 12:09 ` [PATCH v6 04/21] IB/hns: Add RoCE engine reset function Lijun Ou
2016-04-28 12:09 ` [PATCH v6 05/21] IB/hns: Add initial profile resource Lijun Ou
2016-04-28 12:09 ` [PATCH v6 06/21] IB/hns: Add initial cmd operation Lijun Ou
2016-04-28 12:09 ` [PATCH v6 07/21] IB/hns: Add event queue support Lijun Ou
2016-04-28 12:09 ` [PATCH v6 08/21] IB/hns: Add icm support Lijun Ou
2016-04-28 12:09 ` [PATCH v6 09/21] IB/hns: Add hca support Lijun Ou
2016-04-28 12:09 ` [PATCH v6 10/21] IB/hns: Add process flow to init RoCE engine Lijun Ou
2016-04-28 12:09 ` Lijun Ou [this message]
2016-04-28 12:09 ` [PATCH v6 12/21] IB/hns: Set mtu and gid support Lijun Ou
2016-04-28 12:09 ` [PATCH v6 13/21] IB/hns: Add interface of the protocol stack registration Lijun Ou
2016-04-28 12:09 ` [PATCH v6 14/21] IB/hns: Add operations support for IB device and port Lijun Ou
2016-04-28 12:09 ` [PATCH v6 15/21] IB/hns: Add PD operations support Lijun Ou
2016-04-28 12:09 ` [PATCH v6 16/21] IB/hns: Add ah " Lijun Ou
2016-04-28 12:09 ` [PATCH v6 17/21] IB/hns: Add QP " Lijun Ou
2016-04-28 12:09 ` [PATCH v6 18/21] IB/hns: Add CQ " Lijun Ou
2016-04-28 12:09 ` [PATCH v6 19/21] IB/hns: Add memory region " Lijun Ou
2016-04-28 12:09 ` [PATCH v6 20/21] IB/hns: Kconfig and Makefile for RoCE module Lijun Ou
2016-04-28 12:09 ` [PATCH v6 21/21] MAINTAINERS: Add maintainers for HiSilicon RoCE driver Lijun Ou
2016-05-03 18:48 ` [PATCH v6 00/21] Add " Leon Romanovsky
2016-05-04 11:31 ` oulijun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461845396-61306-12-git-send-email-oulijun@huawei.com \
--to=oulijun@huawei.com \
--cc=charles.chenxin@huawei.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=gongyangming@huawei.com \
--cc=haifeng.wei@huawei.com \
--cc=hal.rosenstock@gmail.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jiri@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=sean.hefty@intel.com \
--cc=tangchaofei@huawei.com \
--cc=xiaokun@huawei.com \
--cc=yankejian@huawei.com \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®