net/ngbe: support probe and remove

Add device IDs for Wangxun 1Gb NICs, map device IDs to register ngbe
PMD. Add basic PCIe ethdev probe and remove.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>

diff --git a/doc/guides/nics/features/ngbe.ini b/doc/guides/nics/features/ngbe.ini
index a7a524d..977286a 100644 (file)
--- a/doc/guides/nics/features/ngbe.ini
+++ b/doc/guides/nics/features/ngbe.ini
@@ -4,6 +4,7 @@
 ; Refer to default.ini for the full list of available PMD features.
 ;
 [Features]
+Multiprocess aware   = Y
 Linux                = Y
 ARMv8                = Y
 x86-32               = Y

diff --git a/drivers/net/ngbe/base/meson.build b/drivers/net/ngbe/base/meson.build
new file mode 100644 (file)
index 0000000..13220ee
--- /dev/null
+++ b/drivers/net/ngbe/base/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018-2021 Beijing WangXun Technology Co., Ltd.
+
+sources = []
+
+error_cflags = []
+
+c_args = cflags
+
+base_lib = static_library('ngbe_base', sources,
+    dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci],
+    c_args: c_args)
+base_objs = base_lib.extract_all_objects()

diff --git a/drivers/net/ngbe/base/ngbe_devids.h b/drivers/net/ngbe/base/ngbe_devids.h
new file mode 100644 (file)
index 0000000..6010cc0
--- /dev/null
+++ b/drivers/net/ngbe/base/ngbe_devids.h
@@ -0,0 +1,83 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018-2021 Beijing WangXun Technology Co., Ltd.
+ */
+
+#ifndef _NGBE_DEVIDS_H_
+#define _NGBE_DEVIDS_H_
+
+/*
+ * Vendor ID
+ */
+#ifndef PCI_VENDOR_ID_WANGXUN
+#define PCI_VENDOR_ID_WANGXUN                   0x8088
+#endif
+
+/*
+ * Device IDs
+ */
+#define NGBE_DEV_ID_EM_VF                      0x0110
+#define   NGBE_SUB_DEV_ID_EM_VF                        0x0110
+#define NGBE_DEV_ID_EM                         0x0100
+#define   NGBE_SUB_DEV_ID_EM_MVL_RGMII         0x0200
+#define   NGBE_SUB_DEV_ID_EM_MVL_SFP           0x0403
+#define   NGBE_SUB_DEV_ID_EM_RTL_SGMII         0x0410
+#define   NGBE_SUB_DEV_ID_EM_YT8521S_SFP       0x0460
+
+#define NGBE_DEV_ID_EM_WX1860AL_W              0x0100
+#define NGBE_DEV_ID_EM_WX1860AL_W_VF           0x0110
+#define NGBE_DEV_ID_EM_WX1860A2                        0x0101
+#define NGBE_DEV_ID_EM_WX1860A2_VF             0x0111
+#define NGBE_DEV_ID_EM_WX1860A2S               0x0102
+#define NGBE_DEV_ID_EM_WX1860A2S_VF            0x0112
+#define NGBE_DEV_ID_EM_WX1860A4                        0x0103
+#define NGBE_DEV_ID_EM_WX1860A4_VF             0x0113
+#define NGBE_DEV_ID_EM_WX1860A4S               0x0104
+#define NGBE_DEV_ID_EM_WX1860A4S_VF            0x0114
+#define NGBE_DEV_ID_EM_WX1860AL2               0x0105
+#define NGBE_DEV_ID_EM_WX1860AL2_VF            0x0115
+#define NGBE_DEV_ID_EM_WX1860AL2S              0x0106
+#define NGBE_DEV_ID_EM_WX1860AL2S_VF           0x0116
+#define NGBE_DEV_ID_EM_WX1860AL4               0x0107
+#define NGBE_DEV_ID_EM_WX1860AL4_VF            0x0117
+#define NGBE_DEV_ID_EM_WX1860AL4S              0x0108
+#define NGBE_DEV_ID_EM_WX1860AL4S_VF           0x0118
+#define NGBE_DEV_ID_EM_WX1860NCSI              0x0109
+#define NGBE_DEV_ID_EM_WX1860NCSI_VF           0x0119
+#define NGBE_DEV_ID_EM_WX1860A1                        0x010A
+#define NGBE_DEV_ID_EM_WX1860A1_VF             0x011A
+#define NGBE_DEV_ID_EM_WX1860A1L               0x010B
+#define NGBE_DEV_ID_EM_WX1860A1L_VF            0x011B
+#define   NGBE_SUB_DEV_ID_EM_ZTE5201_RJ45      0x0100
+#define   NGBE_SUB_DEV_ID_EM_SF100F_LP         0x0103
+#define   NGBE_SUB_DEV_ID_EM_M88E1512_RJ45     0x0200
+#define   NGBE_SUB_DEV_ID_EM_SF100HT           0x0102
+#define   NGBE_SUB_DEV_ID_EM_SF200T            0x0201
+#define   NGBE_SUB_DEV_ID_EM_SF200HT           0x0202
+#define   NGBE_SUB_DEV_ID_EM_SF200T_S          0x0210
+#define   NGBE_SUB_DEV_ID_EM_SF200HT_S         0x0220
+#define   NGBE_SUB_DEV_ID_EM_SF200HXT          0x0230
+#define   NGBE_SUB_DEV_ID_EM_SF400T            0x0401
+#define   NGBE_SUB_DEV_ID_EM_SF400HT           0x0402
+#define   NGBE_SUB_DEV_ID_EM_M88E1512_SFP      0x0403
+#define   NGBE_SUB_DEV_ID_EM_SF400T_S          0x0410
+#define   NGBE_SUB_DEV_ID_EM_SF400HT_S         0x0420
+#define   NGBE_SUB_DEV_ID_EM_SF400HXT          0x0430
+#define   NGBE_SUB_DEV_ID_EM_SF400_OCP         0x0440
+#define   NGBE_SUB_DEV_ID_EM_SF400_LY          0x0450
+#define   NGBE_SUB_DEV_ID_EM_SF400_LY_YT       0x0470
+
+/* Assign excessive id with masks */
+#define NGBE_INTERNAL_MASK                     0x000F
+#define NGBE_OEM_MASK                          0x00F0
+#define NGBE_WOL_SUP_MASK                      0x4000
+#define NGBE_NCSI_SUP_MASK                     0x8000
+
+#define NGBE_INTERNAL_SFP                      0x0003
+#define NGBE_OCP_CARD                          0x0040
+#define NGBE_LY_M88E1512_SFP                   0x0050
+#define NGBE_YT8521S_SFP                       0x0060
+#define NGBE_LY_YT8521S_SFP                    0x0070
+#define NGBE_WOL_SUP                           0x4000
+#define NGBE_NCSI_SUP                          0x8000
+
+#endif /* _NGBE_DEVIDS_H_ */

diff --git a/drivers/net/ngbe/meson.build b/drivers/net/ngbe/meson.build
index d5022a2..db7d0eb 100644 (file)
--- a/drivers/net/ngbe/meson.build
+++ b/drivers/net/ngbe/meson.build
@@ -7,6 +7,11 @@ if is_windows
     subdir_done()
 endif
 
+subdir('base')
+objs = [base_objs]
+
 sources = files(
         'ngbe_ethdev.c',
 )
+
+includes += include_directories('base')

diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index eef9b9b..031b42c 100644 (file)
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -7,24 +7,78 @@
 #include <rte_common.h>
 #include <ethdev_pci.h>
 
+#include "ngbe_devids.h"
+
+/*
+ * The set of PCI devices this driver supports
+ */
+static const struct rte_pci_id pci_id_ngbe_map[] = {
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A2) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A2S) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A4) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A4S) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL2) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL2S) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL4) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL4S) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860NCSI) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A1) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A1L) },
+       { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL_W) },
+       { .vendor_id = 0, /* sentinel */ },
+};
+
 static int
-eth_ngbe_pci_probe(struct rte_pci_driver *pci_drv,
-               struct rte_pci_device *pci_dev)
+eth_ngbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
 {
-       RTE_SET_USED(pci_drv);
-       RTE_SET_USED(pci_dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       rte_eth_copy_pci_info(eth_dev, pci_dev);
+
        return -EINVAL;
 }
 
-static int eth_ngbe_pci_remove(struct rte_pci_device *pci_dev)
+static int
+eth_ngbe_dev_uninit(struct rte_eth_dev *eth_dev)
 {
-       RTE_SET_USED(pci_dev);
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       RTE_SET_USED(eth_dev);
+
        return -EINVAL;
 }
 
+static int
+eth_ngbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+               struct rte_pci_device *pci_dev)
+{
+       return rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,
+                       0, eth_dev_pci_specific_init, pci_dev,
+                       eth_ngbe_dev_init, NULL);
+}
+
+static int eth_ngbe_pci_remove(struct rte_pci_device *pci_dev)
+{
+       struct rte_eth_dev *ethdev;
+
+       ethdev = rte_eth_dev_allocated(pci_dev->device.name);
+       if (ethdev == NULL)
+               return 0;
+
+       return rte_eth_dev_destroy(ethdev, eth_ngbe_dev_uninit);
+}
+
 static struct rte_pci_driver rte_ngbe_pmd = {
+       .id_table = pci_id_ngbe_map,
+       .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
        .probe = eth_ngbe_pci_probe,
        .remove = eth_ngbe_pci_remove,
 };
 
 RTE_PMD_REGISTER_PCI(net_ngbe, rte_ngbe_pmd);
+RTE_PMD_REGISTER_PCI_TABLE(net_ngbe, pci_id_ngbe_map);
+RTE_PMD_REGISTER_KMOD_DEP(net_ngbe, "* igb_uio | uio_pci_generic | vfio-pci");