drivers: use PCI registration macro

[dpdk.git] / drivers / net / i40e / i40e_ethdev_vf.c

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 4c5e45e..8177626 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -111,7 +111,7 @@ static int i40evf_dev_link_update(struct rte_eth_dev *dev,
 static void i40evf_dev_stats_get(struct rte_eth_dev *dev,
                                struct rte_eth_stats *stats);
 static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
-                                struct rte_eth_xstats *xstats, unsigned n);
+                                struct rte_eth_xstat *xstats, unsigned n);
 static int i40evf_dev_xstats_get_names(struct rte_eth_dev *dev,
                                       struct rte_eth_xstat_name *xstats_names,
                                       unsigned limit);
@@ -334,8 +334,7 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
        struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
        struct i40evf_arq_msg_info info;
        enum i40evf_aq_result ret;
-       int err = -1;
-       int i = 0;
+       int err, i = 0;
 
        if (_atomic_set_cmd(vf, args->ops))
                return -1;
@@ -356,19 +355,19 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
        switch (args->ops) {
        case I40E_VIRTCHNL_OP_RESET_VF:
                /*no need to process in this function */
+               err = 0;
                break;
        case I40E_VIRTCHNL_OP_VERSION:
        case I40E_VIRTCHNL_OP_GET_VF_RESOURCES:
                /* for init adminq commands, need to poll the response */
+               err = -1;
                do {
                        ret = i40evf_read_pfmsg(dev, &info);
                        if (ret == I40EVF_MSG_CMD) {
                                err = 0;
                                break;
-                       } else if (ret == I40EVF_MSG_ERR) {
-                               err = -1;
+                       } else if (ret == I40EVF_MSG_ERR)
                                break;
-                       }
                        rte_delay_ms(ASQ_DELAY_MS);
                        /* If don't read msg or read sys event, continue */
                } while (i++ < MAX_TRY_TIMES);
@@ -377,6 +376,7 @@ i40evf_execute_vf_cmd(struct rte_eth_dev *dev, struct vf_cmd_info *args)
 
        default:
                /* for other adminq in running time, waiting the cmd done flag */
+               err = -1;
                do {
                        if (vf->pend_cmd == I40E_VIRTCHNL_OP_UNKNOWN) {
                                err = 0;
@@ -999,13 +999,12 @@ static int i40evf_dev_xstats_get_names(__rte_unused struct rte_eth_dev *dev,
                        snprintf(xstats_names[i].name,
                                sizeof(xstats_names[i].name),
                                "%s", rte_i40evf_stats_strings[i].name);
-                       xstats_names[i].id = i;
                }
        return I40EVF_NB_XSTATS;
 }
 
 static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
-                                struct rte_eth_xstats *xstats, unsigned n)
+                                struct rte_eth_xstat *xstats, unsigned n)
 {
        int ret;
        unsigned i;
@@ -1023,7 +1022,6 @@ static int i40evf_dev_xstats_get(struct rte_eth_dev *dev,
 
        /* loop over xstats array and values from pstats */
        for (i = 0; i < I40EVF_NB_XSTATS; i++) {
-               xstats[i].name[0] = '\0';
                xstats[i].id = i;
                xstats[i].value = *(uint64_t *)(((char *)pstats) +
                        rte_i40evf_stats_strings[i].offset);
@@ -1112,9 +1110,12 @@ i40evf_get_link_status(struct rte_eth_dev *dev, struct rte_eth_link *link)
 }
 
 static const struct rte_pci_id pci_id_i40evf_map[] = {
-#define RTE_PCI_DEV_ID_DECL_I40EVF(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
-#include "rte_pci_dev_ids.h"
-{ .vendor_id = 0, /* sentinel */ },
+       { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_VF) },
+       { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_VF_HV) },
+       { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X722_A0_VF) },
+       { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X722_VF) },
+       { RTE_PCI_DEVICE(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_X722_VF_HV) },
+       { .vendor_id = 0, /* sentinel */ },
 };
 
 static inline int
@@ -1556,34 +1557,16 @@ static struct eth_driver rte_i40evf_pmd = {
                .name = "rte_i40evf_pmd",
                .id_table = pci_id_i40evf_map,
                .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE,
+               .probe = rte_eth_dev_pci_probe,
+               .remove = rte_eth_dev_pci_remove,
        },
        .eth_dev_init = i40evf_dev_init,
        .eth_dev_uninit = i40evf_dev_uninit,
        .dev_private_size = sizeof(struct i40e_adapter),
 };
 
-/*
- * VF Driver initialization routine.
- * Invoked one at EAL init time.
- * Register itself as the [Virtual Poll Mode] Driver of PCI Fortville devices.
- */
-static int
-rte_i40evf_pmd_init(const char *name __rte_unused,
-                   const char *params __rte_unused)
-{
-       PMD_INIT_FUNC_TRACE();
-
-       rte_eth_driver_register(&rte_i40evf_pmd);
-
-       return 0;
-}
-
-static struct rte_driver rte_i40evf_driver = {
-       .type = PMD_PDEV,
-       .init = rte_i40evf_pmd_init,
-};
-
-PMD_REGISTER_DRIVER(rte_i40evf_driver);
+DRIVER_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd.pci_drv);
+DRIVER_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map);
 
 static int
 i40evf_dev_configure(struct rte_eth_dev *dev)
@@ -2379,13 +2362,16 @@ i40evf_get_rss_lut(struct i40e_vsi *vsi, uint8_t *lut, uint16_t lut_size)
 static int
 i40evf_set_rss_lut(struct i40e_vsi *vsi, uint8_t *lut, uint16_t lut_size)
 {
-       struct i40e_vf *vf = I40E_VSI_TO_VF(vsi);
-       struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
+       struct i40e_vf *vf;
+       struct i40e_hw *hw;
        int ret;
 
        if (!vsi || !lut)
                return -EINVAL;
 
+       vf = I40E_VSI_TO_VF(vsi);
+       hw = I40E_VSI_TO_HW(vsi);
+
        if (vf->flags & I40E_FLAG_RSS_AQ_CAPABLE) {
                ret = i40e_aq_set_rss_lut(hw, vsi->vsi_id, FALSE,
                                          lut, lut_size);