eventdev: hide event device related structures

[dpdk.git] / drivers / net / octeontx / octeontx_ethdev.c

diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index 0ea6de4..0a2e34d 100644 (file)
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -9,13 +9,14 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <eventdev_pmd.h>
 #include <rte_alarm.h>
 #include <rte_branch_prediction.h>
 #include <rte_bus_vdev.h>
 #include <rte_cycles.h>
 #include <rte_debug.h>
-#include <rte_devargs.h>
 #include <rte_dev.h>
+#include <rte_devargs.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
 #include <rte_mbuf_pool_ops.h>
@@ -47,9 +48,9 @@ enum octeontx_link_speed {
        OCTEONTX_LINK_SPEED_RESERVE2
 };
 
-RTE_LOG_REGISTER(otx_net_logtype_mbox, pmd.net.octeontx.mbox, NOTICE);
-RTE_LOG_REGISTER(otx_net_logtype_init, pmd.net.octeontx.init, NOTICE);
-RTE_LOG_REGISTER(otx_net_logtype_driver, pmd.net.octeontx.driver, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(otx_net_logtype_mbox, mbox, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(otx_net_logtype_init, init, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(otx_net_logtype_driver, driver, NOTICE);
 
 /* Parse integer from integer argument */
 static int
@@ -524,10 +525,6 @@ octeontx_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
        struct rte_eth_dev_data *data = eth_dev->data;
        int rc = 0;
 
-       /* Check if MTU is within the allowed range */
-       if (frame_size < OCCTX_MIN_FRS || frame_size > OCCTX_MAX_FRS)
-               return -EINVAL;
-
        buffsz = data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;
 
        /* Refuse MTU that requires the support of scattered packets
@@ -552,13 +549,6 @@ octeontx_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
        if (rc)
                return rc;
 
-       if (frame_size > RTE_ETHER_MAX_LEN)
-               nic->rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
-       else
-               nic->rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
-
-       /* Update max_rx_pkt_len */
-       data->dev_conf.rxmode.max_rx_pkt_len = frame_size;
        octeontx_log_info("Received pkt beyond  maxlen %d will be dropped",
                          frame_size);
 
@@ -581,7 +571,7 @@ octeontx_recheck_rx_offloads(struct octeontx_rxq *rxq)
        buffsz = mbp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM;
 
        /* Setup scatter mode if needed by jumbo */
-       if (data->dev_conf.rxmode.max_rx_pkt_len > buffsz) {
+       if (data->mtu > buffsz) {
                nic->rx_offloads |= DEV_RX_OFFLOAD_SCATTER;
                nic->rx_offload_flags |= octeontx_rx_offload_flags(eth_dev);
                nic->tx_offload_flags |= octeontx_tx_offload_flags(eth_dev);
@@ -593,8 +583,8 @@ octeontx_recheck_rx_offloads(struct octeontx_rxq *rxq)
        evdev_priv->rx_offload_flags = nic->rx_offload_flags;
        evdev_priv->tx_offload_flags = nic->tx_offload_flags;
 
-       /* Setup MTU based on max_rx_pkt_len */
-       nic->mtu = data->dev_conf.rxmode.max_rx_pkt_len - OCCTX_L2_OVERHEAD;
+       /* Setup MTU */
+       nic->mtu = data->mtu;
 
        return 0;
 }
@@ -615,7 +605,7 @@ octeontx_dev_start(struct rte_eth_dev *dev)
                octeontx_recheck_rx_offloads(rxq);
        }
 
-       /* Setting up the mtu based on max_rx_pkt_len */
+       /* Setting up the mtu */
        ret = octeontx_dev_mtu_set(dev, nic->mtu);
        if (ret) {
                octeontx_log_err("Failed to set default MTU size %d", ret);
@@ -673,7 +663,7 @@ error:
        return ret;
 }
 
-static void
+static int
 octeontx_dev_stop(struct rte_eth_dev *dev)
 {
        struct octeontx_nic *nic = octeontx_pmd_priv(dev);
@@ -687,14 +677,14 @@ octeontx_dev_stop(struct rte_eth_dev *dev)
        if (ret < 0) {
                octeontx_log_err("failed to req stop port %d res=%d",
                                        nic->port_id, ret);
-               return;
+               return ret;
        }
 
        ret = octeontx_pki_port_stop(nic->port_id);
        if (ret < 0) {
                octeontx_log_err("failed to stop pki port %d res=%d",
                                        nic->port_id, ret);
-               return;
+               return ret;
        }
 
        ret = octeontx_pko_channel_stop(nic->base_ochan);
@@ -702,8 +692,10 @@ octeontx_dev_stop(struct rte_eth_dev *dev)
                octeontx_log_err("failed to stop channel %d VF%d %d %d",
                             nic->base_ochan, nic->port_id, nic->num_tx_queues,
                             ret);
-               return;
+               return ret;
        }
+
+       return 0;
 }
 
 static int
@@ -865,7 +857,6 @@ octeontx_dev_info(struct rte_eth_dev *dev,
 
        dev_info->max_mac_addrs =
                                octeontx_bgx_port_mac_entries_get(nic->port_id);
-       dev_info->max_rx_pktlen = PKI_MAX_PKTLEN;
        dev_info->max_rx_queues = 1;
        dev_info->max_tx_queues = PKO_MAX_NUM_DQ;
        dev_info->min_rx_bufsize = 0;
@@ -970,20 +961,18 @@ octeontx_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t qidx)
 }
 
 static void
-octeontx_dev_tx_queue_release(void *tx_queue)
+octeontx_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
 {
-       struct octeontx_txq *txq = tx_queue;
        int res;
 
        PMD_INIT_FUNC_TRACE();
 
-       if (txq) {
-               res = octeontx_dev_tx_queue_stop(txq->eth_dev, txq->queue_id);
+       if (dev->data->tx_queues[qid]) {
+               res = octeontx_dev_tx_queue_stop(dev, qid);
                if (res < 0)
-                       octeontx_log_err("failed stop tx_queue(%d)\n",
-                                  txq->queue_id);
+                       octeontx_log_err("failed stop tx_queue(%d)\n", qid);
 
-               rte_free(txq);
+               rte_free(dev->data->tx_queues[qid]);
        }
 }
 
@@ -1012,7 +1001,7 @@ octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
        if (dev->data->tx_queues[qidx] != NULL) {
                PMD_TX_LOG(DEBUG, "freeing memory prior to re-allocation %d",
                                qidx);
-               octeontx_dev_tx_queue_release(dev->data->tx_queues[qidx]);
+               octeontx_dev_tx_queue_release(dev, qidx);
                dev->data->tx_queues[qidx] = NULL;
        }
 
@@ -1220,9 +1209,9 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
 }
 
 static void
-octeontx_dev_rx_queue_release(void *rxq)
+octeontx_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
 {
-       rte_free(rxq);
+       rte_free(dev->data->rx_queues[qid]);
 }
 
 static const uint32_t *