net/qede/base: support periodic Doorbell Recovery

[dpdk.git] / drivers / net / pcap / rte_eth_pcap.c

diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 4c4604c..8736010 100644 (file)
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -39,6 +39,7 @@ static unsigned char tx_pcap_data[RTE_ETH_PCAP_SNAPLEN];
 static struct timeval start_time;
 static uint64_t start_cycles;
 static uint64_t hz;
+static uint8_t iface_idx;
 
 struct queue_stat {
        volatile unsigned long pkts;
@@ -66,6 +67,7 @@ struct pcap_tx_queue {
 struct pmd_internals {
        struct pcap_rx_queue rx_queue[RTE_PMD_PCAP_MAX_QUEUES];
        struct pcap_tx_queue tx_queue[RTE_PMD_PCAP_MAX_QUEUES];
+       struct ether_addr eth_addr;
        int if_index;
        int single_iface;
 };
@@ -90,10 +92,6 @@ static const char *valid_arguments[] = {
        NULL
 };
 
-static struct ether_addr eth_addr = {
-       .addr_bytes = { 0, 0, 0, 0x1, 0x2, 0x3 }
-};
-
 static struct rte_eth_link pmd_link = {
                .link_speed = ETH_SPEED_NUM_10G,
                .link_duplex = ETH_LINK_FULL_DUPLEX,
@@ -432,6 +430,7 @@ eth_dev_start(struct rte_eth_dev *dev)
                                return -1;
                        rx->pcap = tx->pcap;
                }
+
                goto status_up;
        }
 
@@ -467,6 +466,12 @@ eth_dev_start(struct rte_eth_dev *dev)
        }
 
 status_up:
+       for (i = 0; i < dev->data->nb_rx_queues; i++)
+               dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
+       for (i = 0; i < dev->data->nb_tx_queues; i++)
+               dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
        dev->data->dev_link.link_status = ETH_LINK_UP;
 
        return 0;
@@ -519,6 +524,12 @@ eth_dev_stop(struct rte_eth_dev *dev)
        }
 
 status_down:
+       for (i = 0; i < dev->data->nb_rx_queues; i++)
+               dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
+       for (i = 0; i < dev->data->nb_tx_queues; i++)
+               dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
        dev->data->dev_link.link_status = ETH_LINK_DOWN;
 }
 
@@ -540,7 +551,6 @@ eth_dev_info(struct rte_eth_dev *dev,
        dev_info->max_rx_queues = dev->data->nb_rx_queues;
        dev_info->max_tx_queues = dev->data->nb_tx_queues;
        dev_info->min_rx_bufsize = 0;
-       dev_info->rx_offload_capa = DEV_RX_OFFLOAD_CRC_STRIP;
 }
 
 static int
@@ -646,6 +656,38 @@ eth_tx_queue_setup(struct rte_eth_dev *dev,
        return 0;
 }
 
+static int
+eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+{
+       dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_STARTED;
+
+       return 0;
+}
+
+static int
+eth_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
+{
+       dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STARTED;
+
+       return 0;
+}
+
+static int
+eth_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+{
+       dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
+
+       return 0;
+}
+
+static int
+eth_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
+{
+       dev->data->tx_queue_state[tx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
+
+       return 0;
+}
+
 static const struct eth_dev_ops ops = {
        .dev_start = eth_dev_start,
        .dev_stop = eth_dev_stop,
@@ -654,6 +696,10 @@ static const struct eth_dev_ops ops = {
        .dev_infos_get = eth_dev_info,
        .rx_queue_setup = eth_rx_queue_setup,
        .tx_queue_setup = eth_tx_queue_setup,
+       .rx_queue_start = eth_rx_queue_start,
+       .tx_queue_start = eth_tx_queue_start,
+       .rx_queue_stop = eth_rx_queue_stop,
+       .tx_queue_stop = eth_tx_queue_stop,
        .rx_queue_release = eth_queue_release,
        .tx_queue_release = eth_queue_release,
        .link_update = eth_link_update,
@@ -840,11 +886,19 @@ pmd_init_internals(struct rte_vdev_device *vdev,
         * - and point eth_dev structure to new eth_dev_data structure
         */
        *internals = (*eth_dev)->data->dev_private;
+       /*
+        * Interface MAC = 02:70:63:61:70:<iface_idx>
+        * derived from: 'locally administered':'p':'c':'a':'p':'iface_idx'
+        * where the middle 4 characters are converted to hex.
+        */
+       (*internals)->eth_addr = (struct ether_addr) {
+               .addr_bytes = { 0x02, 0x70, 0x63, 0x61, 0x70, iface_idx++ }
+       };
        data = (*eth_dev)->data;
        data->nb_rx_queues = (uint16_t)nb_rx_queues;
        data->nb_tx_queues = (uint16_t)nb_tx_queues;
        data->dev_link = pmd_link;
-       data->mac_addrs = &eth_addr;
+       data->mac_addrs = &(*internals)->eth_addr;
 
        /*
         * NOTE: we'll replace the data element, of originally allocated
@@ -968,6 +1022,7 @@ pmd_pcap_probe(struct rte_vdev_device *dev)
                }
                /* TODO: request info from primary to set up Rx and Tx */
                eth_dev->dev_ops = &ops;
+               eth_dev->device = &dev->device;
                rte_eth_dev_probing_finish(eth_dev);
                return 0;
        }
@@ -1080,9 +1135,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_pcap,
        ETH_PCAP_TX_IFACE_ARG "=<ifc> "
        ETH_PCAP_IFACE_ARG "=<ifc>");
 
-RTE_INIT(eth_pcap_init_log);
-static void
-eth_pcap_init_log(void)
+RTE_INIT(eth_pcap_init_log)
 {
        eth_pcap_logtype = rte_log_register("pmd.net.pcap");
        if (eth_pcap_logtype >= 0)