net: mana: Probe rdma device in mana driver

Initialize gdma device for rdma inside mana module.
For each gdma device, initialize an auxiliary ib device.

Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com>
Link: https://patch.msgid.link/1746633545-17653-2-git-send-email-kotaranov@linux.microsoft.com
Reviewed-by: Long Li <longli@microsoft.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c
index 8ee1aa3a7ec3d83d0721d28314d85e45b568cc8b..59e7814f0b7021a1a529fbd5baa2a62d28074fe1 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
@@ -1005,7 +1005,6 @@ int mana_gd_register_device(struct gdma_dev *gd)
 
        return 0;
 }
-EXPORT_SYMBOL_NS(mana_gd_register_device, "NET_MANA");
 
 int mana_gd_deregister_device(struct gdma_dev *gd)
 {
@@ -1036,7 +1035,6 @@ int mana_gd_deregister_device(struct gdma_dev *gd)
 
        return err;
 }
-EXPORT_SYMBOL_NS(mana_gd_deregister_device, "NET_MANA");
 
 u32 mana_gd_wq_avail_space(struct gdma_queue *wq)
 {
@@ -1579,8 +1577,14 @@ static int mana_gd_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (err)
                goto cleanup_gd;
 
+       err = mana_rdma_probe(&gc->mana_ib);
+       if (err)
+               goto cleanup_mana;
+
        return 0;
 
+cleanup_mana:
+       mana_remove(&gc->mana, false);
 cleanup_gd:
        mana_gd_cleanup(pdev);
 unmap_bar:
@@ -1608,6 +1612,7 @@ static void mana_gd_remove(struct pci_dev *pdev)
 {
        struct gdma_context *gc = pci_get_drvdata(pdev);
 
+       mana_rdma_remove(&gc->mana_ib);
        mana_remove(&gc->mana, false);
 
        mana_gd_cleanup(pdev);
@@ -1631,6 +1636,7 @@ static int mana_gd_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        struct gdma_context *gc = pci_get_drvdata(pdev);
 
+       mana_rdma_remove(&gc->mana_ib);
        mana_remove(&gc->mana, true);
 
        mana_gd_cleanup(pdev);
@@ -1655,6 +1661,10 @@ static int mana_gd_resume(struct pci_dev *pdev)
        if (err)
                return err;
 
+       err = mana_rdma_probe(&gc->mana_ib);
+       if (err)
+               return err;
+
        return 0;
 }
 
@@ -1665,6 +1675,7 @@ static void mana_gd_shutdown(struct pci_dev *pdev)
 
        dev_info(&pdev->dev, "Shutdown was called\n");
 
+       mana_rdma_remove(&gc->mana_ib);
        mana_remove(&gc->mana, true);
 
        mana_gd_cleanup(pdev);

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 2bac6be8f6a09c1bf9069880dcebd492ff9c4536..fa83f935ffe1fc51d0ea4d76823d8b0dca2fcb67 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -2945,7 +2945,7 @@ static void remove_adev(struct gdma_dev *gd)
        gd->adev = NULL;
 }
 
-static int add_adev(struct gdma_dev *gd)
+static int add_adev(struct gdma_dev *gd, const char *name)
 {
        struct auxiliary_device *adev;
        struct mana_adev *madev;
@@ -2961,7 +2961,7 @@ static int add_adev(struct gdma_dev *gd)
                goto idx_fail;
        adev->id = ret;
 
-       adev->name = "rdma";
+       adev->name = name;
        adev->dev.parent = gd->gdma_context->dev;
        adev->dev.release = adev_release;
        madev->mdev = gd;
@@ -3077,7 +3077,7 @@ int mana_probe(struct gdma_dev *gd, bool resuming)
                }
        }
 
-       err = add_adev(gd);
+       err = add_adev(gd, "eth");
 out:
        if (err) {
                mana_remove(gd, false);
@@ -3151,6 +3151,39 @@ out:
        dev_dbg(dev, "%s succeeded\n", __func__);
 }
 
+int mana_rdma_probe(struct gdma_dev *gd)
+{
+       int err = 0;
+
+       if (gd->dev_id.type != GDMA_DEVICE_MANA_IB) {
+               /* RDMA device is not detected on pci */
+               return err;
+       }
+
+       err = mana_gd_register_device(gd);
+       if (err)
+               return err;
+
+       err = add_adev(gd, "rdma");
+       if (err)
+               mana_gd_deregister_device(gd);
+
+       return err;
+}
+
+void mana_rdma_remove(struct gdma_dev *gd)
+{
+       if (gd->dev_id.type != GDMA_DEVICE_MANA_IB) {
+               /* RDMA device is not detected on pci */
+               return;
+       }
+
+       if (gd->adev)
+               remove_adev(gd);
+
+       mana_gd_deregister_device(gd);
+}
+
 struct net_device *mana_get_primary_netdev(struct mana_context *ac,
                                           u32 port_index,
                                           netdevice_tracker *tracker)

diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index 0f78065de8fe42446af0f1d8dde2dfb970c205d5..5857efc885a655d6a78b3781f1273887bb77481b 100644 (file)
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -488,6 +488,9 @@ int mana_detach(struct net_device *ndev, bool from_close);
 int mana_probe(struct gdma_dev *gd, bool resuming);
 void mana_remove(struct gdma_dev *gd, bool suspending);
 
+int mana_rdma_probe(struct gdma_dev *gd);
+void mana_rdma_remove(struct gdma_dev *gd);
+
 void mana_xdp_tx(struct sk_buff *skb, struct net_device *ndev);
 int mana_xdp_xmit(struct net_device *ndev, int n, struct xdp_frame **frames,
                  u32 flags);