Re: [PATCH v9 11/22] IB/hns: Add IB device registration
From: Leon Romanovsky <leon@kernel.org>
Date: 2016-06-09 06:26:56
Also in:
lkml, netdev
On Wed, Jun 01, 2016 at 11:37:53PM +0800, Lijun Ou wrote:
quoted hunk ↗ jump to hunk
This patch registered IB device when loaded, and unregistered IB device when removed. Signed-off-by: Wei Hu <redacted> Signed-off-by: Nenglong Zhao <redacted> Signed-off-by: Lijun Ou <redacted> --- drivers/infiniband/hw/hns/hns_roce_main.c | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c index 7fb0d34..f179a7f 100644 --- a/drivers/infiniband/hw/hns/hns_roce_main.c +++ b/drivers/infiniband/hw/hns/hns_roce_main.c@@ -62,6 +62,41 @@ #include "hns_roce_device.h" #include "hns_roce_icm.h" +void hns_roce_unregister_device(struct hns_roce_dev *hr_dev)
You are not calling to this function in this patch.
+{
+ ib_unregister_device(&hr_dev->ib_dev);
+}
+
+int hns_roce_register_device(struct hns_roce_dev *hr_dev)This function should be static.
quoted hunk ↗ jump to hunk
+{ + 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;@@ -363,6 +398,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");
According to the current code, you will print this error together with error line in hns_roce_register_device for the same failure. "ib_register_device failed!" "register_device failed!"
+ 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); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Attachments
- signature.asc [application/pgp-signature] 819 bytes