net/atlantic: implement VLAN filters and offloads

[dpdk.git] / drivers / net / softnic / rte_eth_softnic.c

diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c
index 347bdff..0fd264e 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -14,6 +14,7 @@
 #include <rte_errno.h>
 #include <rte_ring.h>
 #include <rte_tm_driver.h>
+#include <rte_mtr_driver.h>
 
 #include "rte_eth_softnic.h"
 #include "rte_eth_softnic_internals.h"
@@ -73,7 +74,6 @@ static const struct rte_eth_dev_info pmd_dev_info = {
                .nb_min = 0,
                .nb_align = 1,
        },
-       .rx_offload_capa = DEV_RX_OFFLOAD_CRC_STRIP,
 };
 
 static int pmd_softnic_logtype;
@@ -99,26 +99,27 @@ static int
 pmd_rx_queue_setup(struct rte_eth_dev *dev,
        uint16_t rx_queue_id,
        uint16_t nb_rx_desc,
-       unsigned int socket_id,
+       unsigned int socket_id __rte_unused,
        const struct rte_eth_rxconf *rx_conf __rte_unused,
        struct rte_mempool *mb_pool __rte_unused)
 {
-       uint32_t size = RTE_ETH_NAME_MAX_LEN + strlen("_rxq") + 4;
-       char name[size];
-       struct rte_ring *r;
-
-       snprintf(name, sizeof(name), "%s_rxq%04x",
-               dev->data->name,
-               rx_queue_id);
-
-       r = rte_ring_create(name,
-               nb_rx_desc,
-               socket_id,
-               RING_F_SP_ENQ | RING_F_SC_DEQ);
-       if (r == NULL)
+       char name[NAME_SIZE];
+       struct pmd_internals *p = dev->data->dev_private;
+       struct softnic_swq *swq;
+
+       struct softnic_swq_params params = {
+               .size = nb_rx_desc,
+       };
+
+       snprintf(name, sizeof(name), "RXQ%u", rx_queue_id);
+
+       swq = softnic_swq_create(p,
+               name,
+               &params);
+       if (swq == NULL)
                return -1;
 
-       dev->data->rx_queues[rx_queue_id] = r;
+       dev->data->rx_queues[rx_queue_id] = swq->r;
        return 0;
 }
 
@@ -126,31 +127,44 @@ static int
 pmd_tx_queue_setup(struct rte_eth_dev *dev,
        uint16_t tx_queue_id,
        uint16_t nb_tx_desc,
-       unsigned int socket_id,
+       unsigned int socket_id __rte_unused,
        const struct rte_eth_txconf *tx_conf __rte_unused)
 {
-       uint32_t size = RTE_ETH_NAME_MAX_LEN + strlen("_txq") + 4;
-       char name[size];
-       struct rte_ring *r;
-
-       snprintf(name, sizeof(name), "%s_txq%04x",
-               dev->data->name,
-               tx_queue_id);
-
-       r = rte_ring_create(name,
-               nb_tx_desc,
-               socket_id,
-               RING_F_SP_ENQ | RING_F_SC_DEQ);
-       if (r == NULL)
+       char name[NAME_SIZE];
+       struct pmd_internals *p = dev->data->dev_private;
+       struct softnic_swq *swq;
+
+       struct softnic_swq_params params = {
+               .size = nb_tx_desc,
+       };
+
+       snprintf(name, sizeof(name), "TXQ%u", tx_queue_id);
+
+       swq = softnic_swq_create(p,
+               name,
+               &params);
+       if (swq == NULL)
                return -1;
 
-       dev->data->tx_queues[tx_queue_id] = r;
+       dev->data->tx_queues[tx_queue_id] = swq->r;
        return 0;
 }
 
 static int
 pmd_dev_start(struct rte_eth_dev *dev)
 {
+       struct pmd_internals *p = dev->data->dev_private;
+       int status;
+
+       /* Firmware */
+       status = softnic_cli_script_process(p,
+               p->params.firmware,
+               conn_params_default.msg_in_len_max,
+               conn_params_default.msg_out_len_max);
+       if (status)
+               return status;
+
+       /* Link UP */
        dev->data->dev_link.link_status = ETH_LINK_UP;
 
        return 0;
@@ -159,21 +173,30 @@ pmd_dev_start(struct rte_eth_dev *dev)
 static void
 pmd_dev_stop(struct rte_eth_dev *dev)
 {
+       struct pmd_internals *p = dev->data->dev_private;
+
+       /* Link DOWN */
        dev->data->dev_link.link_status = ETH_LINK_DOWN;
+
+       /* Firmware */
+       softnic_pipeline_disable_all(p);
+       softnic_pipeline_free(p);
+       softnic_table_action_profile_free(p);
+       softnic_port_in_action_profile_free(p);
+       softnic_tap_free(p);
+       softnic_tmgr_free(p);
+       softnic_link_free(p);
+       softnic_softnic_swq_free_keep_rxq_txq(p);
+       softnic_mempool_free(p);
+
+       tm_hierarchy_free(p);
+       softnic_mtr_free(p);
 }
 
 static void
-pmd_dev_close(struct rte_eth_dev *dev)
+pmd_dev_close(struct rte_eth_dev *dev __rte_unused)
 {
-       uint32_t i;
-
-       /* RX queues */
-       for (i = 0; i < dev->data->nb_rx_queues; i++)
-               rte_ring_free((struct rte_ring *)dev->data->rx_queues[i]);
-
-       /* TX queues */
-       for (i = 0; i < dev->data->nb_tx_queues; i++)
-               rte_ring_free((struct rte_ring *)dev->data->tx_queues[i]);
+       return;
 }
 
 static int
@@ -183,6 +206,21 @@ pmd_link_update(struct rte_eth_dev *dev __rte_unused,
        return 0;
 }
 
+static int
+pmd_filter_ctrl(struct rte_eth_dev *dev __rte_unused,
+               enum rte_filter_type filter_type,
+               enum rte_filter_op filter_op,
+               void *arg)
+{
+       if (filter_type == RTE_ETH_FILTER_GENERIC &&
+                       filter_op == RTE_ETH_FILTER_GET) {
+               *(const void **)arg = &pmd_flow_ops;
+               return 0;
+       }
+
+       return -ENOTSUP;
+}
+
 static int
 pmd_tm_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
 {
@@ -191,6 +229,14 @@ pmd_tm_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
        return 0;
 }
 
+static int
+pmd_mtr_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
+{
+       *(const struct rte_mtr_ops **)arg = &pmd_mtr_ops;
+
+       return 0;
+}
+
 static const struct eth_dev_ops pmd_ops = {
        .dev_configure = pmd_dev_configure,
        .dev_start = pmd_dev_start,
@@ -200,7 +246,9 @@ static const struct eth_dev_ops pmd_ops = {
        .dev_infos_get = pmd_dev_infos_get,
        .rx_queue_setup = pmd_rx_queue_setup,
        .tx_queue_setup = pmd_tx_queue_setup,
+       .filter_ctrl = pmd_filter_ctrl,
        .tm_ops_get = pmd_tm_ops_get,
+       .mtr_ops_get = pmd_mtr_ops_get,
 };
 
 static uint16_t
@@ -242,10 +290,12 @@ pmd_init(struct pmd_params *params)
        memcpy(&p->params, params, sizeof(p->params));
 
        /* Resources */
+       tm_hierarchy_init(p);
+       softnic_mtr_init(p);
+
        softnic_mempool_init(p);
        softnic_swq_init(p);
        softnic_link_init(p);
-       tm_init(p);
        softnic_tmgr_init(p);
        softnic_tap_init(p);
        softnic_port_in_action_profile_init(p);
@@ -291,11 +341,13 @@ pmd_free(struct pmd_internals *p)
        softnic_port_in_action_profile_free(p);
        softnic_tap_free(p);
        softnic_tmgr_free(p);
-       tm_free(p);
        softnic_link_free(p);
        softnic_swq_free(p);
        softnic_mempool_free(p);
 
+       tm_hierarchy_free(p);
+       softnic_mtr_free(p);
+
        rte_free(p);
 }