mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 v11 11/22] IB/hns: Add IB device registration
Date: Sat, 2 Jul 2016 17:39:13 +0800	[thread overview]
Message-ID: <1467452364-66522-12-git-send-email-oulijun@huawei.com> (raw)
In-Reply-To: <1467452364-66522-1-git-send-email-oulijun@huawei.com>

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 v11:
Remove hns_roce_profile_init function for one line of code
which will be called once only according to Leon Romanovsky's
comments over the [PATCH v10 5/22]:
  Link: https://lkml.org/lkml/2016/6/24/419

PATCH v10:
This fixes the comments given by Leon Romanovsky over the PATCH v9:
  Link: https://lkml.org/lkml/2016/6/9/53

PATCH v9/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 | 45 +++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index 966e6d0..61b6ab2 100644
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -39,6 +39,41 @@
 #include "hns_roce_device.h"
 #include "hns_roce_hem.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;
@@ -319,6 +354,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:
+	hr_dev->hw->hw_exit(hr_dev);
+
 error_failed_engine_init:
 	hns_roce_cleanup_bitmap(hr_dev);
 
@@ -354,6 +398,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);
 	hr_dev->hw->hw_exit(hr_dev);
 	hns_roce_cleanup_bitmap(hr_dev);
 	hns_roce_cleanup_hem(hr_dev);
-- 
1.9.1

  parent reply	other threads:[~2016-07-02  9:32 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-02  9:39 [PATCH v11 00/22] Add HiSilicon RoCE driver Lijun Ou
2016-07-02  9:39 ` [PATCH v11 01/22] net: hns: Add reset function support for " Lijun Ou
2016-07-02  9:39 ` [PATCH v11 02/22] devicetree: bindings: IB: Add binding document for HiSilicon RoCE Lijun Ou
2016-07-02  9:39 ` [PATCH v11 03/22] IB/hns: Add initial main frame driver and get cfg info Lijun Ou
2016-07-02  9:39 ` [PATCH v11 04/22] IB/hns: Add RoCE engine reset function Lijun Ou
2016-07-02  9:39 ` [PATCH v11 05/22] IB/hns: Add initial profile resource Lijun Ou
2016-07-02  9:39 ` [PATCH v11 06/22] IB/hns: Add initial cmd operation Lijun Ou
2016-07-02  9:39 ` [PATCH v11 07/22] IB/hns: Add event queue support Lijun Ou
2016-07-02  9:39 ` [PATCH v11 08/22] IB/hns: Add hem support Lijun Ou
2016-07-02  9:39 ` [PATCH v11 09/22] IB/hns: Add hca support Lijun Ou
2016-07-02  9:39 ` [PATCH v11 10/22] IB/hns: Add process flow to init RoCE engine Lijun Ou
2016-07-02  9:39 ` Lijun Ou [this message]
2016-07-02  9:39 ` [PATCH v11 12/22] IB/hns: Set mtu and gid support Lijun Ou
2016-07-02  9:39 ` [PATCH v11 13/22] IB/hns: Add interface of the protocol stack registration Lijun Ou
2016-07-02  9:39 ` [PATCH v11 14/22] IB/hns: Add operations support for IB device and port Lijun Ou
2016-07-02  9:39 ` [PATCH v11 15/22] IB/hns: Add PD operations support Lijun Ou
2016-07-02  9:39 ` [PATCH v11 16/22] IB/hns: Add ah " Lijun Ou
2016-07-02  9:39 ` [PATCH v11 17/22] IB/hns: Add QP " Lijun Ou
2016-07-02  9:39 ` [PATCH v11 18/22] IB/hns: Add CQ " Lijun Ou
2016-07-02  9:39 ` [PATCH v11 19/22] IB/hns: Add memory region " Lijun Ou
2016-07-02  9:39 ` [PATCH v11 20/22] IB/hns: Add operation for getting immutable port Lijun Ou
2016-07-02  9:39 ` [PATCH v11 21/22] IB/hns: Kconfig and Makefile for RoCE module Lijun Ou
2016-07-14  5:35   ` Leon Romanovsky
2016-07-02  9:39 ` [PATCH v11 22/22] MAINTAINERS: Add maintainers for HiSilicon RoCE driver Lijun Ou
2016-07-02 12:58 ` [PATCH v11 00/22] Add " Leon Romanovsky
2016-07-04  6:24   ` Wei Hu (Xavier)
2016-07-04  8:16   ` oulijun
2016-07-08  2:58 ` oulijun
2016-07-11  9:38   ` Wei Hu (Xavier)
2016-07-14  3:43 ` oulijun
2016-07-14  5:25   ` Leon Romanovsky

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=1467452364-66522-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®