app/testpmd: fix DPAA shared library dependency

[dpdk.git] / app / test-pmd / parameters.c

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 5b4da6c..97d22b8 100644 (file)
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -133,10 +133,10 @@ usage(char* progname)
        printf("  --enable-lro: enable large receive offload.\n");
        printf("  --enable-rx-cksum: enable rx hardware checksum offload.\n");
        printf("  --enable-rx-timestamp: enable rx hardware timestamp offload.\n");
-       printf("  --disable-hw-vlan: disable hardware vlan.\n");
-       printf("  --disable-hw-vlan-filter: disable hardware vlan filter.\n");
-       printf("  --disable-hw-vlan-strip: disable hardware vlan strip.\n");
-       printf("  --disable-hw-vlan-extend: disable hardware vlan extend.\n");
+       printf("  --enable-hw-vlan: enable hardware vlan.\n");
+       printf("  --enable-hw-vlan-filter: enable hardware vlan filter.\n");
+       printf("  --enable-hw-vlan-strip: enable hardware vlan strip.\n");
+       printf("  --enable-hw-vlan-extend: enable hardware vlan extend.\n");
        printf("  --enable-drop-en: enable per queue packet drop.\n");
        printf("  --disable-rss: disable rss.\n");
        printf("  --port-topology=N: set port topology (N: paired (default) or "
@@ -516,6 +516,10 @@ parse_event_printing_config(const char *optarg, int enable)
                mask = UINT32_C(1) << RTE_ETH_EVENT_MACSEC;
        else if (!strcmp(optarg, "intr_rmv"))
                mask = UINT32_C(1) << RTE_ETH_EVENT_INTR_RMV;
+       else if (!strcmp(optarg, "dev_probed"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_NEW;
+       else if (!strcmp(optarg, "dev_released"))
+               mask = UINT32_C(1) << RTE_ETH_EVENT_DESTROY;
        else if (!strcmp(optarg, "all"))
                mask = ~UINT32_C(0);
        else {
@@ -535,6 +539,7 @@ launch_args_parse(int argc, char** argv)
        int n, opt;
        char **argvopt;
        int opt_idx;
+       portid_t pid;
        enum { TX, RX };
        /* Default offloads for all ports. */
        uint64_t rx_offloads = rx_mode.offloads;
@@ -580,10 +585,10 @@ launch_args_parse(int argc, char** argv)
                { "enable-rx-cksum",            0, 0, 0 },
                { "enable-rx-timestamp",        0, 0, 0 },
                { "enable-scatter",             0, 0, 0 },
-               { "disable-hw-vlan",            0, 0, 0 },
-               { "disable-hw-vlan-filter",     0, 0, 0 },
-               { "disable-hw-vlan-strip",      0, 0, 0 },
-               { "disable-hw-vlan-extend",     0, 0, 0 },
+               { "enable-hw-vlan",             0, 0, 0 },
+               { "enable-hw-vlan-filter",      0, 0, 0 },
+               { "enable-hw-vlan-strip",       0, 0, 0 },
+               { "enable-hw-vlan-extend",      0, 0, 0 },
                { "enable-drop-en",            0, 0, 0 },
                { "disable-rss",                0, 0, 0 },
                { "port-topology",              1, 0, 0 },
@@ -881,20 +886,20 @@ launch_args_parse(int argc, char** argv)
                        if (!strcmp(lgopts[opt_idx].name,
                                        "enable-rx-timestamp"))
                                rx_offloads |= DEV_RX_OFFLOAD_TIMESTAMP;
-                       if (!strcmp(lgopts[opt_idx].name, "disable-hw-vlan"))
-                               rx_offloads &= ~DEV_RX_OFFLOAD_VLAN;
+                       if (!strcmp(lgopts[opt_idx].name, "enable-hw-vlan"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN;
 
                        if (!strcmp(lgopts[opt_idx].name,
-                                       "disable-hw-vlan-filter"))
-                               rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_FILTER;
+                                       "enable-hw-vlan-filter"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN_FILTER;
 
                        if (!strcmp(lgopts[opt_idx].name,
-                                       "disable-hw-vlan-strip"))
-                               rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP;
+                                       "enable-hw-vlan-strip"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN_STRIP;
 
                        if (!strcmp(lgopts[opt_idx].name,
-                                       "disable-hw-vlan-extend"))
-                               rx_offloads &= ~DEV_RX_OFFLOAD_VLAN_EXTEND;
+                                       "enable-hw-vlan-extend"))
+                               rx_offloads |= DEV_RX_OFFLOAD_VLAN_EXTEND;
 
                        if (!strcmp(lgopts[opt_idx].name, "enable-drop-en"))
                                rx_drop_en = 1;
@@ -921,21 +926,21 @@ launch_args_parse(int argc, char** argv)
                                rss_hf = ETH_RSS_UDP;
                        if (!strcmp(lgopts[opt_idx].name, "rxq")) {
                                n = atoi(optarg);
-                               if (n >= 0 && n <= (int) MAX_QUEUE_ID)
+                               if (n >= 0 && check_nb_rxq((queueid_t)n) == 0)
                                        nb_rxq = (queueid_t) n;
                                else
                                        rte_exit(EXIT_FAILURE, "rxq %d invalid - must be"
-                                                 " >= 0 && <= %d\n", n,
-                                                 (int) MAX_QUEUE_ID);
+                                                 " >= 0 && <= %u\n", n,
+                                                 get_allowed_max_nb_rxq(&pid));
                        }
                        if (!strcmp(lgopts[opt_idx].name, "txq")) {
                                n = atoi(optarg);
-                               if (n >= 0 && n <= (int) MAX_QUEUE_ID)
+                               if (n >= 0 && check_nb_txq((queueid_t)n) == 0)
                                        nb_txq = (queueid_t) n;
                                else
                                        rte_exit(EXIT_FAILURE, "txq %d invalid - must be"
-                                                 " >= 0 && <= %d\n", n,
-                                                 (int) MAX_QUEUE_ID);
+                                                 " >= 0 && <= %u\n", n,
+                                                 get_allowed_max_nb_txq(&pid));
                        }
                        if (!nb_rxq && !nb_txq) {
                                rte_exit(EXIT_FAILURE, "Either rx or tx queues should "