Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752675AbcDWK0A (ORCPT ); Sat, 23 Apr 2016 06:26:00 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:29578 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751911AbcDWKSO (ORCPT ); Sat, 23 Apr 2016 06:18:14 -0400 From: Lijun Ou To: , , , , , , , CC: , , , , , , , , , , , Subject: [PATCH v5 11/21] IB/hns: Add IB device registration function Date: Sat, 23 Apr 2016 18:26:49 +0800 Message-ID: <1461407219-72027-12-git-send-email-oulijun@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461407219-72027-1-git-send-email-oulijun@huawei.com> References: <1461407219-72027-1-git-send-email-oulijun@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.71.200.31] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.571B4BE3.0028,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 42da8f855b9d9717d5c037f0dc28a665 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2231 Lines: 83 This patch registers IB device and unregister IB device when removed. Signed-off-by: Lijun Ou Signed-off-by: Wei Hu(Xavier) --- 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