net: add rte prefix to ether structures
[dpdk.git] / drivers / net / octeontx / octeontx_ethdev.c
index e71a0cb..6434792 100644 (file)
@@ -1,34 +1,7 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright (C) Cavium Inc. 2017. All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Cavium networks nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Cavium, Inc
  */
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <rte_dev.h>
 #include <rte_kvargs.h>
 #include <rte_malloc.h>
+#include <rte_mbuf_pool_ops.h>
 #include <rte_prefetch.h>
-#include <rte_vdev.h>
+#include <rte_bus_vdev.h>
 
 #include "octeontx_ethdev.h"
+#include "octeontx_rxtx.h"
 #include "octeontx_logs.h"
 
 struct octeontx_vdev_init_params {
        uint8_t nr_port;
 };
 
+uint16_t
+rte_octeontx_pchan_map[OCTEONTX_MAX_BGX_PORTS][OCTEONTX_MAX_LMAC_PER_BGX];
+
 enum octeontx_link_speed {
        OCTEONTX_LINK_SPEED_SGMII,
        OCTEONTX_LINK_SPEED_XAUI,
@@ -64,6 +42,25 @@ enum octeontx_link_speed {
        OCTEONTX_LINK_SPEED_RESERVE2
 };
 
+int otx_net_logtype_mbox;
+int otx_net_logtype_init;
+int otx_net_logtype_driver;
+
+RTE_INIT(otx_net_init_log)
+{
+       otx_net_logtype_mbox = rte_log_register("pmd.net.octeontx.mbox");
+       if (otx_net_logtype_mbox >= 0)
+               rte_log_set_level(otx_net_logtype_mbox, RTE_LOG_NOTICE);
+
+       otx_net_logtype_init = rte_log_register("pmd.net.octeontx.init");
+       if (otx_net_logtype_init >= 0)
+               rte_log_set_level(otx_net_logtype_init, RTE_LOG_NOTICE);
+
+       otx_net_logtype_driver = rte_log_register("pmd.net.octeontx.driver");
+       if (otx_net_logtype_driver >= 0)
+               rte_log_set_level(otx_net_logtype_driver, RTE_LOG_NOTICE);
+}
+
 /* Parse integer from integer argument */
 static int
 parse_integer_arg(const char *key __rte_unused,
@@ -123,7 +120,7 @@ octeontx_port_open(struct octeontx_nic *nic)
        int res;
 
        res = 0;
-
+       memset(&bgx_port_conf, 0x0, sizeof(bgx_port_conf));
        PMD_INIT_FUNC_TRACE();
 
        res = octeontx_bgx_port_open(nic->port_id, &bgx_port_conf);
@@ -160,6 +157,22 @@ octeontx_port_close(struct octeontx_nic *nic)
        octeontx_log_dbg("port closed %d", nic->port_id);
 }
 
+static int
+octeontx_port_start(struct octeontx_nic *nic)
+{
+       PMD_INIT_FUNC_TRACE();
+
+       return octeontx_bgx_port_start(nic->port_id);
+}
+
+static int
+octeontx_port_stop(struct octeontx_nic *nic)
+{
+       PMD_INIT_FUNC_TRACE();
+
+       return octeontx_bgx_port_stop(nic->port_id);
+}
+
 static void
 octeontx_port_promisc_set(struct octeontx_nic *nic, int en)
 {
@@ -182,6 +195,42 @@ octeontx_port_promisc_set(struct octeontx_nic *nic, int en)
                        nic->port_id, en ? "set" : "unset");
 }
 
+static int
+octeontx_port_stats(struct octeontx_nic *nic, struct rte_eth_stats *stats)
+{
+       octeontx_mbox_bgx_port_stats_t bgx_stats;
+       int res;
+
+       PMD_INIT_FUNC_TRACE();
+
+       res = octeontx_bgx_port_stats(nic->port_id, &bgx_stats);
+       if (res < 0) {
+               octeontx_log_err("failed to get port stats %d", nic->port_id);
+               return res;
+       }
+
+       stats->ipackets = bgx_stats.rx_packets;
+       stats->ibytes = bgx_stats.rx_bytes;
+       stats->imissed = bgx_stats.rx_dropped;
+       stats->ierrors = bgx_stats.rx_errors;
+       stats->opackets = bgx_stats.tx_packets;
+       stats->obytes = bgx_stats.tx_bytes;
+       stats->oerrors = bgx_stats.tx_errors;
+
+       octeontx_log_dbg("port%d stats inpkts=%" PRIx64 " outpkts=%" PRIx64 "",
+                       nic->port_id, stats->ipackets, stats->opackets);
+
+       return 0;
+}
+
+static void
+octeontx_port_stats_clr(struct octeontx_nic *nic)
+{
+       PMD_INIT_FUNC_TRACE();
+
+       octeontx_bgx_port_stats_clr(nic->port_id);
+}
+
 static inline void
 devconf_set_default_sane_values(struct rte_event_dev_config *dev_conf,
                                struct rte_event_dev_info *info)
@@ -232,34 +281,9 @@ octeontx_dev_configure(struct rte_eth_dev *dev)
                return -EINVAL;
        }
 
-       if (!rxmode->hw_strip_crc) {
-               PMD_INIT_LOG(NOTICE, "can't disable hw crc strip");
-               rxmode->hw_strip_crc = 1;
-       }
-
-       if (rxmode->hw_ip_checksum) {
-               PMD_INIT_LOG(NOTICE, "rxcksum not supported");
-               rxmode->hw_ip_checksum = 0;
-       }
-
-       if (rxmode->split_hdr_size) {
-               octeontx_log_err("rxmode does not support split header");
-               return -EINVAL;
-       }
-
-       if (rxmode->hw_vlan_filter) {
-               octeontx_log_err("VLAN filter not supported");
-               return -EINVAL;
-       }
-
-       if (rxmode->hw_vlan_extend) {
-               octeontx_log_err("VLAN extended not supported");
-               return -EINVAL;
-       }
-
-       if (rxmode->enable_lro) {
-               octeontx_log_err("LRO not supported");
-               return -EINVAL;
+       if (!(txmode->offloads & DEV_TX_OFFLOAD_MT_LOCKFREE)) {
+               PMD_INIT_LOG(NOTICE, "cant disable lockfree tx");
+               txmode->offloads |= DEV_TX_OFFLOAD_MT_LOCKFREE;
        }
 
        if (conf->link_speeds & ETH_LINK_SPEED_FIXED) {
@@ -296,35 +320,145 @@ octeontx_dev_configure(struct rte_eth_dev *dev)
 }
 
 static void
-octeontx_dev_promisc_enable(struct rte_eth_dev *dev)
+octeontx_dev_close(struct rte_eth_dev *dev)
 {
+       struct octeontx_txq *txq = NULL;
        struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+       unsigned int i;
+       int ret;
 
        PMD_INIT_FUNC_TRACE();
-       octeontx_port_promisc_set(nic, 1);
+
+       rte_event_dev_close(nic->evdev);
+
+       ret = octeontx_pko_channel_close(nic->base_ochan);
+       if (ret < 0) {
+               octeontx_log_err("failed to close channel %d VF%d %d %d",
+                            nic->base_ochan, nic->port_id, nic->num_tx_queues,
+                            ret);
+       }
+       /* Free txq resources for this port */
+       for (i = 0; i < nic->num_tx_queues; i++) {
+               txq = dev->data->tx_queues[i];
+               if (!txq)
+                       continue;
+
+               rte_free(txq);
+       }
+
+       dev->tx_pkt_burst = NULL;
+       dev->rx_pkt_burst = NULL;
+}
+
+static int
+octeontx_dev_start(struct rte_eth_dev *dev)
+{
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+       int ret;
+
+       ret = 0;
+
+       PMD_INIT_FUNC_TRACE();
+       /*
+        * Tx start
+        */
+       dev->tx_pkt_burst = octeontx_xmit_pkts;
+       ret = octeontx_pko_channel_start(nic->base_ochan);
+       if (ret < 0) {
+               octeontx_log_err("fail to conf VF%d no. txq %d chan %d ret %d",
+                          nic->port_id, nic->num_tx_queues, nic->base_ochan,
+                          ret);
+               goto error;
+       }
+
+       /*
+        * Rx start
+        */
+       dev->rx_pkt_burst = octeontx_recv_pkts;
+       ret = octeontx_pki_port_start(nic->port_id);
+       if (ret < 0) {
+               octeontx_log_err("fail to start Rx on port %d", nic->port_id);
+               goto channel_stop_error;
+       }
+
+       /*
+        * Start port
+        */
+       ret = octeontx_port_start(nic);
+       if (ret < 0) {
+               octeontx_log_err("failed start port %d", ret);
+               goto pki_port_stop_error;
+       }
+
+       PMD_TX_LOG(DEBUG, "pko: start channel %d no.of txq %d port %d",
+                       nic->base_ochan, nic->num_tx_queues, nic->port_id);
+
+       ret = rte_event_dev_start(nic->evdev);
+       if (ret < 0) {
+               octeontx_log_err("failed to start evdev: ret (%d)", ret);
+               goto pki_port_stop_error;
+       }
+
+       /* Success */
+       return ret;
+
+pki_port_stop_error:
+       octeontx_pki_port_stop(nic->port_id);
+channel_stop_error:
+       octeontx_pko_channel_stop(nic->base_ochan);
+error:
+       return ret;
 }
 
 static void
-octeontx_dev_promisc_disable(struct rte_eth_dev *dev)
+octeontx_dev_stop(struct rte_eth_dev *dev)
 {
        struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+       int ret;
 
        PMD_INIT_FUNC_TRACE();
-       octeontx_port_promisc_set(nic, 0);
+
+       rte_event_dev_stop(nic->evdev);
+
+       ret = octeontx_port_stop(nic);
+       if (ret < 0) {
+               octeontx_log_err("failed to req stop port %d res=%d",
+                                       nic->port_id, ret);
+               return;
+       }
+
+       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;
+       }
+
+       ret = octeontx_pko_channel_stop(nic->base_ochan);
+       if (ret < 0) {
+               octeontx_log_err("failed to stop channel %d VF%d %d %d",
+                            nic->base_ochan, nic->port_id, nic->num_tx_queues,
+                            ret);
+               return;
+       }
 }
 
-static inline int
-octeontx_atomic_write_link_status(struct rte_eth_dev *dev,
-                                 struct rte_eth_link *link)
+static void
+octeontx_dev_promisc_enable(struct rte_eth_dev *dev)
 {
-       struct rte_eth_link *dst = &dev->data->dev_link;
-       struct rte_eth_link *src = link;
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
 
-       if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
-               *(uint64_t *)src) == 0)
-               return -1;
+       PMD_INIT_FUNC_TRACE();
+       octeontx_port_promisc_set(nic, 1);
+}
 
-       return 0;
+static void
+octeontx_dev_promisc_disable(struct rte_eth_dev *dev)
+{
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+
+       PMD_INIT_FUNC_TRACE();
+       octeontx_port_promisc_set(nic, 0);
 }
 
 static int
@@ -357,7 +491,6 @@ octeontx_dev_link_update(struct rte_eth_dev *dev,
        struct rte_eth_link link;
        int res;
 
-       res = 0;
        PMD_INIT_FUNC_TRACE();
 
        res = octeontx_port_link_status(nic);
@@ -391,14 +524,48 @@ octeontx_dev_link_update(struct rte_eth_dev *dev,
        case OCTEONTX_LINK_SPEED_RESERVE1:
        case OCTEONTX_LINK_SPEED_RESERVE2:
        default:
+               link.link_speed = ETH_SPEED_NUM_NONE;
                octeontx_log_err("incorrect link speed %d", nic->speed);
                break;
        }
 
-       link.link_duplex = ETH_LINK_AUTONEG;
-       link.link_autoneg = ETH_LINK_SPEED_AUTONEG;
+       link.link_duplex = ETH_LINK_FULL_DUPLEX;
+       link.link_autoneg = ETH_LINK_AUTONEG;
+
+       return rte_eth_linkstatus_set(dev, &link);
+}
+
+static int
+octeontx_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
+{
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
 
-       return octeontx_atomic_write_link_status(dev, &link);
+       PMD_INIT_FUNC_TRACE();
+       return octeontx_port_stats(nic, stats);
+}
+
+static void
+octeontx_dev_stats_reset(struct rte_eth_dev *dev)
+{
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+
+       PMD_INIT_FUNC_TRACE();
+       octeontx_port_stats_clr(nic);
+}
+
+static int
+octeontx_dev_default_mac_addr_set(struct rte_eth_dev *dev,
+                                       struct rte_ether_addr *addr)
+{
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+       int ret;
+
+       ret = octeontx_bgx_port_mac_set(nic->port_id, addr->addr_bytes);
+       if (ret != 0)
+               octeontx_log_err("failed to set MAC address on port %d",
+                               nic->port_id);
+
+       return ret;
 }
 
 static void
@@ -413,37 +580,412 @@ octeontx_dev_info(struct rte_eth_dev *dev,
                        ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G |
                        ETH_LINK_SPEED_40G;
 
-       dev_info->driver_name = RTE_STR(rte_octeontx_pmd);
        dev_info->max_mac_addrs = 1;
        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;
-       dev_info->pci_dev = NULL;
 
        dev_info->default_rxconf = (struct rte_eth_rxconf) {
                .rx_free_thresh = 0,
                .rx_drop_en = 0,
+               .offloads = OCTEONTX_RX_OFFLOADS,
        };
 
        dev_info->default_txconf = (struct rte_eth_txconf) {
                .tx_free_thresh = 0,
-               .txq_flags =
-                       ETH_TXQ_FLAGS_NOMULTSEGS |
-                       ETH_TXQ_FLAGS_NOOFFLOADS |
-                       ETH_TXQ_FLAGS_NOXSUMS,
+               .offloads = OCTEONTX_TX_OFFLOADS,
        };
 
-       dev_info->tx_offload_capa = DEV_TX_OFFLOAD_MT_LOCKFREE;
+       dev_info->rx_offload_capa = OCTEONTX_RX_OFFLOADS;
+       dev_info->tx_offload_capa = OCTEONTX_TX_OFFLOADS;
+}
+
+static void
+octeontx_dq_info_getter(octeontx_dq_t *dq, void *out)
+{
+       ((octeontx_dq_t *)out)->lmtline_va = dq->lmtline_va;
+       ((octeontx_dq_t *)out)->ioreg_va = dq->ioreg_va;
+       ((octeontx_dq_t *)out)->fc_status_va = dq->fc_status_va;
+}
+
+static int
+octeontx_vf_start_tx_queue(struct rte_eth_dev *dev, struct octeontx_nic *nic,
+                               uint16_t qidx)
+{
+       struct octeontx_txq *txq;
+       int res;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dev->data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STARTED)
+               return 0;
+
+       txq = dev->data->tx_queues[qidx];
+
+       res = octeontx_pko_channel_query_dqs(nic->base_ochan,
+                                               &txq->dq,
+                                               sizeof(octeontx_dq_t),
+                                               txq->queue_id,
+                                               octeontx_dq_info_getter);
+       if (res < 0) {
+               res = -EFAULT;
+               goto close_port;
+       }
+
+       dev->data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STARTED;
+       return res;
+
+close_port:
+       (void)octeontx_port_stop(nic);
+       octeontx_pko_channel_stop(nic->base_ochan);
+       octeontx_pko_channel_close(nic->base_ochan);
+       dev->data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STOPPED;
+       return res;
+}
+
+static int
+octeontx_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t qidx)
+{
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+
+       PMD_INIT_FUNC_TRACE();
+       qidx = qidx % PKO_VF_NUM_DQ;
+       return octeontx_vf_start_tx_queue(dev, nic, qidx);
+}
+
+static inline int
+octeontx_vf_stop_tx_queue(struct rte_eth_dev *dev, struct octeontx_nic *nic,
+                         uint16_t qidx)
+{
+       int ret = 0;
+
+       RTE_SET_USED(nic);
+       PMD_INIT_FUNC_TRACE();
+
+       if (dev->data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STOPPED)
+               return 0;
+
+       dev->data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STOPPED;
+       return ret;
+}
+
+static int
+octeontx_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t qidx)
+{
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+
+       PMD_INIT_FUNC_TRACE();
+       qidx = qidx % PKO_VF_NUM_DQ;
+
+       return octeontx_vf_stop_tx_queue(dev, nic, qidx);
+}
+
+static void
+octeontx_dev_tx_queue_release(void *tx_queue)
+{
+       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 (res < 0)
+                       octeontx_log_err("failed stop tx_queue(%d)\n",
+                                  txq->queue_id);
+
+               rte_free(txq);
+       }
+}
+
+static int
+octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
+                           uint16_t nb_desc, unsigned int socket_id,
+                           const struct rte_eth_txconf *tx_conf __rte_unused)
+{
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+       struct octeontx_txq *txq = NULL;
+       uint16_t dq_num;
+       int res = 0;
+
+       RTE_SET_USED(nb_desc);
+       RTE_SET_USED(socket_id);
+
+       dq_num = (nic->port_id * PKO_VF_NUM_DQ) + qidx;
+
+       /* Socket id check */
+       if (socket_id != (unsigned int)SOCKET_ID_ANY &&
+                       socket_id != (unsigned int)nic->node)
+               PMD_TX_LOG(INFO, "socket_id expected %d, configured %d",
+                                               socket_id, nic->node);
+
+       /* Free memory prior to re-allocation if needed. */
+       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]);
+               dev->data->tx_queues[qidx] = NULL;
+       }
+
+       /* Allocating tx queue data structure */
+       txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct octeontx_txq),
+                                RTE_CACHE_LINE_SIZE, nic->node);
+       if (txq == NULL) {
+               octeontx_log_err("failed to allocate txq=%d", qidx);
+               res = -ENOMEM;
+               goto err;
+       }
+
+       txq->eth_dev = dev;
+       txq->queue_id = dq_num;
+       dev->data->tx_queues[qidx] = txq;
+       dev->data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STOPPED;
+
+       res = octeontx_pko_channel_query_dqs(nic->base_ochan,
+                                               &txq->dq,
+                                               sizeof(octeontx_dq_t),
+                                               txq->queue_id,
+                                               octeontx_dq_info_getter);
+       if (res < 0) {
+               res = -EFAULT;
+               goto err;
+       }
+
+       PMD_TX_LOG(DEBUG, "[%d]:[%d] txq=%p nb_desc=%d lmtline=%p ioreg_va=%p fc_status_va=%p",
+                       qidx, txq->queue_id, txq, nb_desc, txq->dq.lmtline_va,
+                       txq->dq.ioreg_va,
+                       txq->dq.fc_status_va);
+
+       return res;
+
+err:
+       if (txq)
+               rte_free(txq);
+
+       return res;
+}
+
+static int
+octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
+                               uint16_t nb_desc, unsigned int socket_id,
+                               const struct rte_eth_rxconf *rx_conf,
+                               struct rte_mempool *mb_pool)
+{
+       struct octeontx_nic *nic = octeontx_pmd_priv(dev);
+       struct rte_mempool_ops *mp_ops = NULL;
+       struct octeontx_rxq *rxq = NULL;
+       pki_pktbuf_cfg_t pktbuf_conf;
+       pki_hash_cfg_t pki_hash;
+       pki_qos_cfg_t pki_qos;
+       uintptr_t pool;
+       int ret, port;
+       uint16_t gaura;
+       unsigned int ev_queues = (nic->ev_queues * nic->port_id) + qidx;
+       unsigned int ev_ports = (nic->ev_ports * nic->port_id) + qidx;
+
+       RTE_SET_USED(nb_desc);
+
+       memset(&pktbuf_conf, 0, sizeof(pktbuf_conf));
+       memset(&pki_hash, 0, sizeof(pki_hash));
+       memset(&pki_qos, 0, sizeof(pki_qos));
+
+       mp_ops = rte_mempool_get_ops(mb_pool->ops_index);
+       if (strcmp(mp_ops->name, "octeontx_fpavf")) {
+               octeontx_log_err("failed to find octeontx_fpavf mempool");
+               return -ENOTSUP;
+       }
+
+       /* Handle forbidden configurations */
+       if (nic->pki.classifier_enable) {
+               octeontx_log_err("cannot setup queue %d. "
+                                       "Classifier option unsupported", qidx);
+               return -EINVAL;
+       }
+
+       port = nic->port_id;
+
+       /* Rx deferred start is not supported */
+       if (rx_conf->rx_deferred_start) {
+               octeontx_log_err("rx deferred start not supported");
+               return -EINVAL;
+       }
+
+       /* Verify queue index */
+       if (qidx >= dev->data->nb_rx_queues) {
+               octeontx_log_err("QID %d not supporteded (0 - %d available)\n",
+                               qidx, (dev->data->nb_rx_queues - 1));
+               return -ENOTSUP;
+       }
+
+       /* Socket id check */
+       if (socket_id != (unsigned int)SOCKET_ID_ANY &&
+                       socket_id != (unsigned int)nic->node)
+               PMD_RX_LOG(INFO, "socket_id expected %d, configured %d",
+                                               socket_id, nic->node);
+
+       /* Allocating rx queue data structure */
+       rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct octeontx_rxq),
+                                RTE_CACHE_LINE_SIZE, nic->node);
+       if (rxq == NULL) {
+               octeontx_log_err("failed to allocate rxq=%d", qidx);
+               return -ENOMEM;
+       }
+
+       if (!nic->pki.initialized) {
+               pktbuf_conf.port_type = 0;
+               pki_hash.port_type = 0;
+               pki_qos.port_type = 0;
+
+               pktbuf_conf.mmask.f_wqe_skip = 1;
+               pktbuf_conf.mmask.f_first_skip = 1;
+               pktbuf_conf.mmask.f_later_skip = 1;
+               pktbuf_conf.mmask.f_mbuff_size = 1;
+               pktbuf_conf.mmask.f_cache_mode = 1;
+
+               pktbuf_conf.wqe_skip = OCTTX_PACKET_WQE_SKIP;
+               pktbuf_conf.first_skip = OCTTX_PACKET_FIRST_SKIP(mb_pool);
+               pktbuf_conf.later_skip = OCTTX_PACKET_LATER_SKIP;
+               pktbuf_conf.mbuff_size = (mb_pool->elt_size -
+                                       RTE_PKTMBUF_HEADROOM -
+                                       rte_pktmbuf_priv_size(mb_pool) -
+                                       sizeof(struct rte_mbuf));
+
+               pktbuf_conf.cache_mode = PKI_OPC_MODE_STF2_STT;
+
+               ret = octeontx_pki_port_pktbuf_config(port, &pktbuf_conf);
+               if (ret != 0) {
+                       octeontx_log_err("fail to configure pktbuf for port %d",
+                                       port);
+                       rte_free(rxq);
+                       return ret;
+               }
+               PMD_RX_LOG(DEBUG, "Port %d Rx pktbuf configured:\n"
+                               "\tmbuf_size:\t0x%0x\n"
+                               "\twqe_skip:\t0x%0x\n"
+                               "\tfirst_skip:\t0x%0x\n"
+                               "\tlater_skip:\t0x%0x\n"
+                               "\tcache_mode:\t%s\n",
+                               port,
+                               pktbuf_conf.mbuff_size,
+                               pktbuf_conf.wqe_skip,
+                               pktbuf_conf.first_skip,
+                               pktbuf_conf.later_skip,
+                               (pktbuf_conf.cache_mode ==
+                                               PKI_OPC_MODE_STT) ?
+                               "STT" :
+                               (pktbuf_conf.cache_mode ==
+                                               PKI_OPC_MODE_STF) ?
+                               "STF" :
+                               (pktbuf_conf.cache_mode ==
+                                               PKI_OPC_MODE_STF1_STT) ?
+                               "STF1_STT" : "STF2_STT");
+
+               if (nic->pki.hash_enable) {
+                       pki_hash.tag_dlc = 1;
+                       pki_hash.tag_slc = 1;
+                       pki_hash.tag_dlf = 1;
+                       pki_hash.tag_slf = 1;
+                       pki_hash.tag_prt = 1;
+                       octeontx_pki_port_hash_config(port, &pki_hash);
+               }
+
+               pool = (uintptr_t)mb_pool->pool_id;
+
+               /* Get the gaura Id */
+               gaura = octeontx_fpa_bufpool_gaura(pool);
+
+               pki_qos.qpg_qos = PKI_QPG_QOS_NONE;
+               pki_qos.num_entry = 1;
+               pki_qos.drop_policy = 0;
+               pki_qos.tag_type = 0L;
+               pki_qos.qos_entry[0].port_add = 0;
+               pki_qos.qos_entry[0].gaura = gaura;
+               pki_qos.qos_entry[0].ggrp_ok = ev_queues;
+               pki_qos.qos_entry[0].ggrp_bad = ev_queues;
+               pki_qos.qos_entry[0].grptag_bad = 0;
+               pki_qos.qos_entry[0].grptag_ok = 0;
+
+               ret = octeontx_pki_port_create_qos(port, &pki_qos);
+               if (ret < 0) {
+                       octeontx_log_err("failed to create QOS port=%d, q=%d",
+                                       port, qidx);
+                       rte_free(rxq);
+                       return ret;
+               }
+               nic->pki.initialized = true;
+       }
+
+       rxq->port_id = nic->port_id;
+       rxq->eth_dev = dev;
+       rxq->queue_id = qidx;
+       rxq->evdev = nic->evdev;
+       rxq->ev_queues = ev_queues;
+       rxq->ev_ports = ev_ports;
+
+       dev->data->rx_queues[qidx] = rxq;
+       dev->data->rx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STOPPED;
+       return 0;
+}
+
+static void
+octeontx_dev_rx_queue_release(void *rxq)
+{
+       rte_free(rxq);
+}
+
+static const uint32_t *
+octeontx_dev_supported_ptypes_get(struct rte_eth_dev *dev)
+{
+       static const uint32_t ptypes[] = {
+               RTE_PTYPE_L3_IPV4,
+               RTE_PTYPE_L3_IPV4_EXT,
+               RTE_PTYPE_L3_IPV6,
+               RTE_PTYPE_L3_IPV6_EXT,
+               RTE_PTYPE_L4_TCP,
+               RTE_PTYPE_L4_UDP,
+               RTE_PTYPE_L4_FRAG,
+               RTE_PTYPE_UNKNOWN
+       };
+
+       if (dev->rx_pkt_burst == octeontx_recv_pkts)
+               return ptypes;
+
+       return NULL;
+}
+
+static int
+octeontx_pool_ops(struct rte_eth_dev *dev, const char *pool)
+{
+       RTE_SET_USED(dev);
+
+       if (!strcmp(pool, "octeontx_fpavf"))
+               return 0;
+
+       return -ENOTSUP;
 }
 
 /* Initialize and register driver with DPDK Application */
 static const struct eth_dev_ops octeontx_dev_ops = {
        .dev_configure           = octeontx_dev_configure,
        .dev_infos_get           = octeontx_dev_info,
+       .dev_close               = octeontx_dev_close,
+       .dev_start               = octeontx_dev_start,
+       .dev_stop                = octeontx_dev_stop,
        .promiscuous_enable      = octeontx_dev_promisc_enable,
        .promiscuous_disable     = octeontx_dev_promisc_disable,
        .link_update             = octeontx_dev_link_update,
+       .stats_get               = octeontx_dev_stats_get,
+       .stats_reset             = octeontx_dev_stats_reset,
+       .mac_addr_set            = octeontx_dev_default_mac_addr_set,
+       .tx_queue_start          = octeontx_dev_tx_queue_start,
+       .tx_queue_stop           = octeontx_dev_tx_queue_stop,
+       .tx_queue_setup          = octeontx_dev_tx_queue_setup,
+       .tx_queue_release        = octeontx_dev_tx_queue_release,
+       .rx_queue_setup          = octeontx_dev_rx_queue_setup,
+       .rx_queue_release        = octeontx_dev_rx_queue_release,
+       .dev_supported_ptypes_get = octeontx_dev_supported_ptypes_get,
+       .pool_ops_supported      = octeontx_pool_ops,
 };
 
 /* Create Ethdev interface per BGX LMAC ports */
@@ -455,7 +997,7 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
        char octtx_name[OCTEONTX_MAX_NAME_LEN];
        struct octeontx_nic *nic = NULL;
        struct rte_eth_dev *eth_dev = NULL;
-       struct rte_eth_dev_data *data = NULL;
+       struct rte_eth_dev_data *data;
        const char *name = rte_vdev_device_name(dev);
 
        PMD_INIT_FUNC_TRACE();
@@ -466,15 +1008,22 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
                if (eth_dev == NULL)
                        return -ENODEV;
 
+               eth_dev->dev_ops = &octeontx_dev_ops;
+               eth_dev->device = &dev->device;
+               eth_dev->tx_pkt_burst = octeontx_xmit_pkts;
+               eth_dev->rx_pkt_burst = octeontx_recv_pkts;
+               rte_eth_dev_probing_finish(eth_dev);
                return 0;
        }
 
-       data = rte_zmalloc_socket(octtx_name, sizeof(*data), 0, socket_id);
-       if (data == NULL) {
-               octeontx_log_err("failed to allocate devdata");
+       /* Reserve an ethdev entry */
+       eth_dev = rte_eth_dev_allocate(octtx_name);
+       if (eth_dev == NULL) {
+               octeontx_log_err("failed to allocate rte_eth_dev");
                res = -ENOMEM;
                goto err;
        }
+       data = eth_dev->data;
 
        nic = rte_zmalloc_socket(octtx_name, sizeof(*nic), 0, socket_id);
        if (nic == NULL) {
@@ -482,6 +1031,7 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
                res = -ENOMEM;
                goto err;
        }
+       data->dev_private = nic;
 
        nic->port_id = port;
        nic->evdev = evdev;
@@ -498,24 +1048,12 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
                goto err;
        }
 
-       /* Reserve an ethdev entry */
-       eth_dev = rte_eth_dev_allocate(octtx_name);
-       if (eth_dev == NULL) {
-               octeontx_log_err("failed to allocate rte_eth_dev");
-               res = -ENOMEM;
-               goto err;
-       }
-
        eth_dev->device = &dev->device;
        eth_dev->intr_handle = NULL;
        eth_dev->data->kdrv = RTE_KDRV_NONE;
        eth_dev->data->numa_node = dev->device.numa_node;
 
-       rte_memcpy(data, (eth_dev)->data, sizeof(*data));
-       data->dev_private = nic;
-
        data->port_id = eth_dev->data->port_id;
-       snprintf(data->name, sizeof(data->name), "%s", eth_dev->data->name);
 
        nic->ev_queues = 1;
        nic->ev_ports = 1;
@@ -534,7 +1072,6 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
                goto err;
        }
 
-       eth_dev->data = data;
        eth_dev->dev_ops = &octeontx_dev_ops;
 
        /* Finally save ethdev pointer to the NIC structure */
@@ -557,18 +1094,17 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
                                nic->num_tx_queues);
        PMD_INIT_LOG(DEBUG, "speed %d mtu %d", nic->speed, nic->mtu);
 
+       rte_octeontx_pchan_map[(nic->base_ochan >> 8) & 0x7]
+               [(nic->base_ochan >> 4) & 0xF] = data->port_id;
+
+       rte_eth_dev_probing_finish(eth_dev);
        return data->port_id;
 
 err:
-       if (port)
+       if (nic)
                octeontx_port_close(nic);
 
-       if (eth_dev != NULL) {
-               rte_free(eth_dev->data->mac_addrs);
-               rte_free(data);
-               rte_free(nic);
-               rte_eth_dev_release_port(eth_dev);
-       }
+       rte_eth_dev_release_port(eth_dev);
 
        return res;
 }
@@ -593,17 +1129,22 @@ octeontx_remove(struct rte_vdev_device *dev)
                if (eth_dev == NULL)
                        return -ENODEV;
 
+               if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+                       rte_eth_dev_release_port(eth_dev);
+                       continue;
+               }
+
                nic = octeontx_pmd_priv(eth_dev);
                rte_event_dev_stop(nic->evdev);
                PMD_INIT_LOG(INFO, "Closing octeontx device %s", octtx_name);
 
-               rte_free(eth_dev->data->mac_addrs);
-               rte_free(eth_dev->data->dev_private);
-               rte_free(eth_dev->data);
                rte_eth_dev_release_port(eth_dev);
                rte_event_dev_close(nic->evdev);
        }
 
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
        /* Free FC resource */
        octeontx_pko_fc_free();
 
@@ -621,12 +1162,28 @@ octeontx_probe(struct rte_vdev_device *dev)
        struct rte_event_dev_config dev_conf;
        const char *eventdev_name = "event_octeontx";
        struct rte_event_dev_info info;
+       struct rte_eth_dev *eth_dev;
 
        struct octeontx_vdev_init_params init_params = {
                OCTEONTX_VDEV_DEFAULT_MAX_NR_PORT
        };
 
        dev_name = rte_vdev_device_name(dev);
+
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
+           strlen(rte_vdev_device_args(dev)) == 0) {
+               eth_dev = rte_eth_dev_attach_secondary(dev_name);
+               if (!eth_dev) {
+                       RTE_LOG(ERR, PMD, "Failed to probe %s\n", dev_name);
+                       return -1;
+               }
+               /* TODO: request info from primary to set up Rx and Tx */
+               eth_dev->dev_ops = &octeontx_dev_ops;
+               eth_dev->device = &dev->device;
+               rte_eth_dev_probing_finish(eth_dev);
+               return 0;
+       }
+
        res = octeontx_parse_vdev_init_params(&init_params, dev);
        if (res < 0)
                return -EINVAL;
@@ -681,15 +1238,8 @@ octeontx_probe(struct rte_vdev_device *dev)
                res = -EINVAL;
                goto parse_error;
        }
-       if (pnum > qnum) {
-               /*
-                * We don't poll on event ports
-                * that do not have any queues assigned.
-                */
-               pnum = qnum;
-               PMD_INIT_LOG(INFO,
-                       "reducing number of active event ports to %d", pnum);
-       }
+
+       /* Enable all queues available */
        for (i = 0; i < qnum; i++) {
                res = rte_event_queue_setup(evdev, i, NULL);
                if (res < 0) {
@@ -699,6 +1249,7 @@ octeontx_probe(struct rte_vdev_device *dev)
                }
        }
 
+       /* Enable all ports available */
        for (i = 0; i < pnum; i++) {
                res = rte_event_port_setup(evdev, i, NULL);
                if (res < 0) {
@@ -707,6 +1258,14 @@ octeontx_probe(struct rte_vdev_device *dev)
                                                i, res);
                        goto parse_error;
                }
+       }
+
+       /*
+        * Do 1:1 links for ports & queues. All queues would be mapped to
+        * one port. If there are more ports than queues, then some ports
+        * won't be linked to any queue.
+        */
+       for (i = 0; i < qnum; i++) {
                /* Link one queue to one event port */
                qlist = i;
                res = rte_event_port_link(evdev, i, &qlist, NULL, 1);
@@ -738,6 +1297,7 @@ octeontx_probe(struct rte_vdev_device *dev)
                res = -ENOTSUP;
                goto parse_error;
        }
+       rte_mbuf_set_platform_mempool_ops("octeontx_fpavf");
        probe_once = 1;
 
        return 0;