d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ixgbe: convert to use of PMD_REGISTER_DRIVER and fix linking

Browse Source 
Convert the ixgbe pmd driver to use the PMD_REGISTER_DRIVER macro.
This means that the test applications now have no reference to the ixgbe library
when building DSO's and must specify its use on the command line with the -d
option.  Static linking will still initalize the driver automatically.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
This commit is contained in:
Neil Horman 2014-04-21 10:59:35 -04:00 committed by Thomas Monjalon
parent 4ac16f77f0
commit 7b9d82208b
4 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/dpdk_qat/main.c
View File

@ -696,12 +696,6 @@ MAIN(int argc, char **argv)
if (ret < 0)
return -1;
/* init driver */
#ifdef RTE_LIBRTE_IXGBE_PMD
if (rte_ixgbe_pmd_init() < 0)
rte_panic("Cannot init ixgbe pmd\n");
#endif
if (rte_eal_pci_probe() < 0)
rte_panic("Cannot probe PCI\n");

4
examples/vmdq_dcb/main.c
View File

@ -455,10 +455,6 @@ MAIN(int argc, char *argv[])
if (ret < 0)
rte_exit(EXIT_FAILURE, "Invalid VMDQ argument\n");
if (rte_ixgbe_pmd_init() != 0 ||
rte_eal_pci_probe() != 0)
rte_exit(EXIT_FAILURE, "Error with NIC driver initialization\n");
cores = rte_lcore_count();
if ((cores & (cores - 1)) != 0 || cores > 128) {
rte_exit(EXIT_FAILURE,"This program can only run on an even"

13
lib/librte_ether/rte_ethdev.h
View File

@ -1315,15 +1315,6 @@ struct eth_driver {
*/
extern void rte_eth_driver_register(struct eth_driver *eth_drv);
/**
* The initialization function of the driver for 10Gbps Intel IXGBE
* Ethernet devices.
* Invoked once at EAL start time.
* @return
* 0 on success
*/
extern int rte_ixgbe_pmd_init(void);
/**
* The initialization function of the driver for 10Gbps Intel IXGBE_VF
* Ethernet devices.
@ -1375,10 +1366,6 @@ int rte_pmd_init_all(void)
int ret = -ENODEV;
#ifdef RTE_LIBRTE_IXGBE_PMD
if ((ret = rte_ixgbe_pmd_init()) != 0) {
RTE_LOG(ERR, PMD, "Cannot init ixgbe PMD\n");
return (ret);
}
if ((ret = rte_ixgbevf_pmd_init()) != 0) {
RTE_LOG(ERR, PMD, "Cannot init ixgbevf PMD\n");
return (ret);

12
lib/librte_pmd_ixgbe/ixgbe_ethdev.c
View File

@ -58,6 +58,7 @@
#include <rte_ethdev.h>
#include <rte_atomic.h>
#include <rte_malloc.h>
#include <rte_dev.h>
#include "ixgbe_logs.h"
#include "ixgbe/ixgbe_api.h"
@ -955,8 +956,8 @@ static struct eth_driver rte_ixgbevf_pmd = {
* Invoked once at EAL init time.
* Register itself as the [Poll Mode] Driver of PCI IXGBE devices.
*/
int
rte_ixgbe_pmd_init(void)
static int
rte_ixgbe_pmd_init(const char *name __rte_unused, const char *params __rte_unused)
{
PMD_INIT_FUNC_TRACE();
@ -3060,3 +3061,10 @@ ixgbe_mirror_rule_reset(struct rte_eth_dev *dev, uint8_t rule_id)
return 0;
}
static struct rte_driver rte_ixgbe_driver = {
.type = PMD_PDEV,
.init = rte_ixgbe_pmd_init,
};
PMD_REGISTER_DRIVER(rte_ixgbe_driver);