ethdev: remove unused kernel driver field

This field was not generic as it was filled with PCI kernel drivers only.
It has no known in-tree user (and I could not find opensource projects
using it).

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Andrew Rybchenko <arybchenko@solarflare.com>

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index e992cfc..b590ed4 100644 (file)
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -127,9 +127,6 @@ Deprecation Notices
 * pci: The ``rte_kernel_driver`` enum defined in rte_dev.h will be made private
   to the PCI subsystem as it is used only by the PCI bus driver and PCI
   drivers.
-  The associated field ``kdrv`` in the ethdev ``rte_eth_dev_data`` structure
-  will be removed as it gave no useful abstracted information to the
-  applications and had no user (neither internal nor external).
 
 * mbuf: Some fields will be converted to dynamic API in DPDK 20.11
   in order to reserve more space for the dynamic fields, as explained in

diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
index 755e8e4..61b6b89 100644 (file)
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -109,6 +109,9 @@ API Changes
   the structures ``rte_mbuf`` and ``rte_mbuf_ext_shared_info``.
   The field ``refcnt`` is remaining from the old unions.
 
+* ethdev: Removed the ``kdrv`` field in the ethdev ``rte_eth_dev_data``
+  structure as it gave no useful abstracted information to the applications.
+
 * rawdev: Added a structure size parameter to the functions
   ``rte_rawdev_queue_setup()``, ``rte_rawdev_queue_conf_get()``,
   ``rte_rawdev_info_get()`` and ``rte_rawdev_configure()``,

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index 673a8e2..5bf3ebc 100644 (file)
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -827,7 +827,6 @@ mvneta_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
        memcpy(eth_dev->data->mac_addrs[0].addr_bytes,
               req.ifr_addr.sa_data, RTE_ETHER_ADDR_LEN);
 
-       eth_dev->data->kdrv = RTE_KDRV_NONE;
        eth_dev->device = &vdev->device;
        eth_dev->rx_pkt_burst = mvneta_rx_pkt_burst;
        mvneta_set_tx_function(eth_dev);

diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 96b27df..f5e77d0 100644 (file)
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -2856,7 +2856,6 @@ mrvl_eth_dev_create(struct rte_vdev_device *vdev, const char *name)
        memcpy(eth_dev->data->mac_addrs[0].addr_bytes,
               req.ifr_addr.sa_data, RTE_ETHER_ADDR_LEN);
 
-       eth_dev->data->kdrv = RTE_KDRV_NONE;
        eth_dev->device = &vdev->device;
        eth_dev->rx_pkt_burst = mrvl_rx_pkt_burst;
        mrvl_set_tx_function(eth_dev);

diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index 76c6929..653ab9b 100644 (file)
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -1363,7 +1363,6 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
 
        eth_dev->device = &dev->device;
        eth_dev->intr_handle = NULL;
-       eth_dev->data->kdrv = RTE_KDRV_NONE;
        eth_dev->data->numa_node = dev->device.numa_node;
 
        data->port_id = eth_dev->data->port_id;

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 733c898..40fe1ca 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -326,7 +326,6 @@ do_eth_dev_ring_create(const char *name,
        data->all_multicast = 1;
 
        eth_dev->dev_ops = &ops;
-       data->kdrv = RTE_KDRV_NONE;
        data->numa_node = numa_node;
 
        /* finally assign rx and tx ops */

diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c
index 866d17a..e453fd1 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -391,7 +391,6 @@ pmd_ethdev_register(struct rte_vdev_device *vdev,
        dev->data->dev_link.link_status = ETH_LINK_DOWN;
        dev->data->mac_addrs = &eth_addr;
        dev->data->promiscuous = 1;
-       dev->data->kdrv = RTE_KDRV_NONE;
        dev->data->numa_node = params->cpu_id;
 
        rte_eth_dev_probing_finish(dev);

diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/librte_ethdev/rte_ethdev_core.h
index 32407dd..78c7902 100644 (file)
--- a/lib/librte_ethdev/rte_ethdev_core.h
+++ b/lib/librte_ethdev/rte_ethdev_core.h
@@ -866,7 +866,6 @@ struct rte_eth_dev_data {
        uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT];
                /**< Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0). */
        uint32_t dev_flags;             /**< Capabilities. */
-       enum rte_kernel_driver kdrv;    /**< Kernel driver passthrough. */
        int numa_node;                  /**< NUMA node connection. */
        struct rte_vlan_filter_conf vlan_filter_conf;
                        /**< VLAN filter configuration. */

diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h
index a999602..6ac6ea4 100644 (file)
--- a/lib/librte_ethdev/rte_ethdev_pci.h
+++ b/lib/librte_ethdev/rte_ethdev_pci.h
@@ -67,7 +67,6 @@ rte_eth_copy_pci_info(struct rte_eth_dev *eth_dev,
                if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_RMV)
                        eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_RMV;
 
-               eth_dev->data->kdrv = pci_dev->kdrv;
                eth_dev->data->numa_node = pci_dev->device.numa_node;
        }
 }

diff --git a/lib/librte_ethdev/rte_ethdev_vdev.h b/lib/librte_ethdev/rte_ethdev_vdev.h
index b3ef123..64fa689 100644 (file)
--- a/lib/librte_ethdev/rte_ethdev_vdev.h
+++ b/lib/librte_ethdev/rte_ethdev_vdev.h
@@ -74,7 +74,6 @@ rte_eth_vdev_allocate(struct rte_vdev_device *dev, size_t private_data_size)
        eth_dev->device = &dev->device;
        eth_dev->intr_handle = NULL;
 
-       eth_dev->data->kdrv = RTE_KDRV_NONE;
        eth_dev->data->numa_node = dev->device.numa_node;
        return eth_dev;
 }