From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <nhorman@tuxdriver.com>
Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58])
by dpdk.org (Postfix) with ESMTP id BEBD4AFD7
for <dev@dpdk.org>; Tue, 15 Apr 2014 20:07:27 +0200 (CEST)
Received: from hmsreliant.think-freely.org
([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost)
by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63)
(envelope-from <nhorman@tuxdriver.com>)
id 1Wa7lJ-00030t-H4; Tue, 15 Apr 2014 14:07:27 -0400
From: Neil Horman <nhorman@tuxdriver.com>
To: dev@dpdk.org
Date: Tue, 15 Apr 2014 14:06:05 -0400
Message-Id: <1397585169-14537-12-git-send-email-nhorman@tuxdriver.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1397585169-14537-1-git-send-email-nhorman@tuxdriver.com>
References: <1397585169-14537-1-git-send-email-nhorman@tuxdriver.com>
X-Spam-Score: -2.9 (--)
X-Spam-Status: No
Subject: [dpdk-dev] [PATCH 11/15] ixgbe: Convert to use of
PMD_REGISTER_DRIVER and fix linking
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Apr 2014 18:07:28 -0000
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>
---
examples/dpdk_qat/main.c | 6 ------
examples/vmdq_dcb/main.c | 4 ----
lib/librte_ether/rte_ethdev.h | 13 -------------
lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 13 +++++++++++--
4 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/examples/dpdk_qat/main.c b/examples/dpdk_qat/main.c
index 64cb610..741d3f3 100644
--- a/examples/dpdk_qat/main.c
+++ b/examples/dpdk_qat/main.c
@@ -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");
diff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c
index 844f334..1626ba5 100644
--- a/examples/vmdq_dcb/main.c
+++ b/examples/vmdq_dcb/main.c
@@ -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"
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 9e32f56..9621be7 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1316,15 +1316,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.
* Invoked once at EAL start time.
@@ -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);
diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
index a5a7f9a..92ba064 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
@@ -58,6 +58,8 @@
#include <rte_ethdev.h>
#include <rte_atomic.h>
#include <rte_malloc.h>
+#include <rte_dev.h>
+#include <rte_pmd.h>
#include "ixgbe_logs.h"
#include "ixgbe/ixgbe_api.h"
@@ -955,8 +957,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 +3062,10 @@ ixgbe_mirror_rule_reset(struct rte_eth_dev *dev, uint8_t rule_id)
return 0;
}
+
+struct rte_driver rte_ixgbe_driver = {
+ .type = PMD_PDEV,
+ .init = rte_ixgbe_pmd_init,
+};
+
+PMD_REGISTER_DRIVER(rte_ixgbe_driver);
--
1.8.3.1