net/ark: support multi-port packet generation

Added support for packet generation in
multi-port Arkville implementations. The packet
generator is a singleton within the device but is
capable of generating packets for any port within
one device.

Signed-off-by: John Miller <john.miller@atomicrules.com>

diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index 51b9e0470126db0cd975b5e2a698ef0446aa60b7..76b88c62d095e3ed7cbe715031e25ecba198e838 100644 (file)
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -493,6 +493,7 @@ ark_config_device(struct rte_eth_dev *dev)
         * known state
         */
        ark->start_pg = 0;
+       ark->pg_running = 0;
        ark->pg = ark_pktgen_init(ark->pktgen.v, 0, 1);
        if (ark->pg == NULL)
                return -1;
@@ -607,18 +608,23 @@ eth_ark_dev_start(struct rte_eth_dev *dev)
        if (ark->start_pg)
                ark_pktchkr_run(ark->pc);
 
-       if (ark->start_pg && (dev->data->port_id == 0)) {
+       if (ark->start_pg && !ark->pg_running) {
                pthread_t thread;
 
                /* Delay packet generatpr start allow the hardware to be ready
                 * This is only used for sanity checking with internal generator
                 */
-               if (rte_ctrl_thread_create(&thread, "ark-delay-pg", NULL,
+               char tname[32];
+               snprintf(tname, sizeof(tname), "ark-delay-pg-%d",
+                        dev->data->port_id);
+
+               if (rte_ctrl_thread_create(&thread, tname, NULL,
                                           ark_pktgen_delay_start, ark->pg)) {
                        ARK_PMD_LOG(ERR, "Could not create pktgen "
                                    "starter thread\n");
                        return -1;
                }
+               ark->pg_running = 1;
        }
 
        if (ark->user_ext.dev_start)
@@ -647,8 +653,10 @@ eth_ark_dev_stop(struct rte_eth_dev *dev)
                       ark->user_data[dev->data->port_id]);
 
        /* Stop the packet generator */
-       if (ark->start_pg)
+       if (ark->start_pg && ark->pg_running) {
                ark_pktgen_pause(ark->pg);
+               ark->pg_running = 0;
+       }
 
        dev->rx_pkt_burst = rte_eth_pkt_burst_dummy;
        dev->tx_pkt_burst = rte_eth_pkt_burst_dummy;

diff --git a/drivers/net/ark/ark_global.h b/drivers/net/ark/ark_global.h
index 49193ac5b31d6d0380b1466d9e673b2af02057d2..3c3a712bc85f89c1277f435d378f339f9da333f9 100644 (file)
--- a/drivers/net/ark/ark_global.h
+++ b/drivers/net/ark/ark_global.h
@@ -107,6 +107,7 @@ struct ark_adapter {
 
        /* Pointers to packet generator and checker */
        int start_pg;
+       uint16_t pg_running;
        ark_pkt_gen_t pg;
        ark_pkt_chkr_t pc;
        ark_pkt_dir_t pd;