pci: introduce library and driver

[dpdk.git] / examples / ip_pipeline / init.c

diff --git a/examples/ip_pipeline/init.c b/examples/ip_pipeline/init.c
index be148fc..e56e404 100644 (file)
--- a/examples/ip_pipeline/init.c
+++ b/examples/ip_pipeline/init.c
@@ -49,6 +49,7 @@
 #include <rte_ip.h>
 #include <rte_eal.h>
 #include <rte_malloc.h>
+#include <rte_bus_pci.h>
 
 #include "app.h"
 #include "pipeline.h"
@@ -296,11 +297,6 @@ app_init_eal(struct app_params *app)
                app->eal_argv[n_args++] = strdup(buffer);
        }
 
-       if ((p->xen_dom0_present) && (p->xen_dom0)) {
-               snprintf(buffer, sizeof(buffer), "--xen-dom0");
-               app->eal_argv[n_args++] = strdup(buffer);
-       }
-
        snprintf(buffer, sizeof(buffer), "--");
        app->eal_argv[n_args++] = strdup(buffer);
 
@@ -1003,16 +999,30 @@ app_init_link(struct app_params *app)
                        struct app_pktq_hwq_in_params *p_rxq =
                                &app->hwq_in_params[j];
                        uint32_t rxq_link_id, rxq_queue_id;
+                       uint16_t nb_rxd = p_rxq->size;
 
                        sscanf(p_rxq->name, "RXQ%" PRIu32 ".%" PRIu32,
                                &rxq_link_id, &rxq_queue_id);
                        if (rxq_link_id != link_id)
                                continue;
 
+                       status = rte_eth_dev_adjust_nb_rx_tx_desc(
+                               p_link->pmd_id,
+                               &nb_rxd,
+                               NULL);
+                       if (status < 0)
+                               rte_panic("%s (%" PRIu32 "): "
+                                       "%s adjust number of Rx descriptors "
+                                       "error (%" PRId32 ")\n",
+                                       p_link->name,
+                                       p_link->pmd_id,
+                                       p_rxq->name,
+                                       status);
+
                        status = rte_eth_rx_queue_setup(
                                p_link->pmd_id,
                                rxq_queue_id,
-                               p_rxq->size,
+                               nb_rxd,
                                app_get_cpu_socket_id(p_link->pmd_id),
                                &p_rxq->conf,
                                app->mempool[p_rxq->mempool_id]);
@@ -1030,16 +1040,30 @@ app_init_link(struct app_params *app)
                        struct app_pktq_hwq_out_params *p_txq =
                                &app->hwq_out_params[j];
                        uint32_t txq_link_id, txq_queue_id;
+                       uint16_t nb_txd = p_txq->size;
 
                        sscanf(p_txq->name, "TXQ%" PRIu32 ".%" PRIu32,
                                &txq_link_id, &txq_queue_id);
                        if (txq_link_id != link_id)
                                continue;
 
+                       status = rte_eth_dev_adjust_nb_rx_tx_desc(
+                               p_link->pmd_id,
+                               NULL,
+                               &nb_txd);
+                       if (status < 0)
+                               rte_panic("%s (%" PRIu32 "): "
+                                       "%s adjust number of Tx descriptors "
+                                       "error (%" PRId32 ")\n",
+                                       p_link->name,
+                                       p_link->pmd_id,
+                                       p_txq->name,
+                                       status);
+
                        status = rte_eth_tx_queue_setup(
                                p_link->pmd_id,
                                txq_queue_id,
-                               p_txq->size,
+                               nb_txd,
                                app_get_cpu_socket_id(p_link->pmd_id),
                                &p_txq->conf);
                        if (status < 0)
@@ -1208,7 +1232,7 @@ app_init_tap(struct app_params *app)
 
 #ifdef RTE_LIBRTE_KNI
 static int
-kni_config_network_interface(uint8_t port_id, uint8_t if_up) {
+kni_config_network_interface(uint16_t port_id, uint8_t if_up) {
        int ret = 0;
 
        if (port_id >= rte_eth_dev_count())
@@ -1222,7 +1246,7 @@ kni_config_network_interface(uint8_t port_id, uint8_t if_up) {
 }
 
 static int
-kni_change_mtu(uint8_t port_id, unsigned new_mtu) {
+kni_change_mtu(uint16_t port_id, unsigned int new_mtu) {
        int ret;
 
        if (port_id >= rte_eth_dev_count())