drivers/net: remove redundant new line from logs
[dpdk.git] / drivers / net / nfp / nfp_net.c
index 869c55c..173bebf 100644 (file)
@@ -308,7 +308,6 @@ static void
 nfp_net_reset_rx_queue(struct nfp_net_rxq *rxq)
 {
        nfp_net_rx_queue_release_mbufs(rxq);
-       rxq->wr_p = 0;
        rxq->rd_p = 0;
        rxq->nb_rx_hold = 0;
 }
@@ -347,8 +346,6 @@ nfp_net_reset_tx_queue(struct nfp_net_txq *txq)
        nfp_net_tx_queue_release_mbufs(txq);
        txq->wr_p = 0;
        txq->rd_p = 0;
-       txq->tail = 0;
-       txq->qcp_rd_p = 0;
 }
 
 static int
@@ -377,12 +374,12 @@ __nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t update)
                if (new == 0)
                        break;
                if (new & NFP_NET_CFG_UPDATE_ERR) {
-                       PMD_INIT_LOG(ERR, "Reconfig error: 0x%08x\n", new);
+                       PMD_INIT_LOG(ERR, "Reconfig error: 0x%08x", new);
                        return -1;
                }
                if (cnt >= NFP_NET_POLL_TIMEOUT) {
                        PMD_INIT_LOG(ERR, "Reconfig timeout for 0x%08x after"
-                                         " %dms\n", update, cnt);
+                                         " %dms", update, cnt);
                        rte_panic("Exiting\n");
                }
                nanosleep(&wait, 0); /* waiting for a 1ms */
@@ -426,7 +423,7 @@ nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update)
         * Reconfig errors imply situations where they can be handled.
         * Otherwise, rte_panic is called inside __nfp_net_reconfig
         */
-       PMD_INIT_LOG(ERR, "Error nfp_net reconfig for ctrl: %x update: %x\n",
+       PMD_INIT_LOG(ERR, "Error nfp_net reconfig for ctrl: %x update: %x",
                     ctrl, update);
        return -EIO;
 }
@@ -456,7 +453,7 @@ nfp_net_configure(struct rte_eth_dev *dev)
         * called after that internal process
         */
 
-       PMD_INIT_LOG(DEBUG, "Configure\n");
+       PMD_INIT_LOG(DEBUG, "Configure");
 
        dev_conf = &dev->data->dev_conf;
        rxmode = &dev_conf->rxmode;
@@ -464,7 +461,7 @@ nfp_net_configure(struct rte_eth_dev *dev)
 
        /* Checking TX mode */
        if (txmode->mq_mode) {
-               PMD_INIT_LOG(INFO, "TX mq_mode DCB and VMDq not supported\n");
+               PMD_INIT_LOG(INFO, "TX mq_mode DCB and VMDq not supported");
                return -EINVAL;
        }
 
@@ -474,13 +471,13 @@ nfp_net_configure(struct rte_eth_dev *dev)
                        update = NFP_NET_CFG_UPDATE_RSS;
                        new_ctrl = NFP_NET_CFG_CTRL_RSS;
                } else {
-                       PMD_INIT_LOG(INFO, "RSS not supported\n");
+                       PMD_INIT_LOG(INFO, "RSS not supported");
                        return -EINVAL;
                }
        }
 
        if (rxmode->split_hdr_size) {
-               PMD_INIT_LOG(INFO, "rxmode does not support split header\n");
+               PMD_INIT_LOG(INFO, "rxmode does not support split header");
                return -EINVAL;
        }
 
@@ -488,13 +485,13 @@ nfp_net_configure(struct rte_eth_dev *dev)
                if (hw->cap & NFP_NET_CFG_CTRL_RXCSUM) {
                        new_ctrl |= NFP_NET_CFG_CTRL_RXCSUM;
                } else {
-                       PMD_INIT_LOG(INFO, "RXCSUM not supported\n");
+                       PMD_INIT_LOG(INFO, "RXCSUM not supported");
                        return -EINVAL;
                }
        }
 
        if (rxmode->hw_vlan_filter) {
-               PMD_INIT_LOG(INFO, "VLAN filter not supported\n");
+               PMD_INIT_LOG(INFO, "VLAN filter not supported");
                return -EINVAL;
        }
 
@@ -502,13 +499,13 @@ nfp_net_configure(struct rte_eth_dev *dev)
                if (hw->cap & NFP_NET_CFG_CTRL_RXVLAN) {
                        new_ctrl |= NFP_NET_CFG_CTRL_RXVLAN;
                } else {
-                       PMD_INIT_LOG(INFO, "hw vlan strip not supported\n");
+                       PMD_INIT_LOG(INFO, "hw vlan strip not supported");
                        return -EINVAL;
                }
        }
 
        if (rxmode->hw_vlan_extend) {
-               PMD_INIT_LOG(INFO, "VLAN extended not supported\n");
+               PMD_INIT_LOG(INFO, "VLAN extended not supported");
                return -EINVAL;
        }
 
@@ -520,12 +517,12 @@ nfp_net_configure(struct rte_eth_dev *dev)
                /* this is handled in rte_eth_dev_configure */
 
        if (rxmode->hw_strip_crc) {
-               PMD_INIT_LOG(INFO, "strip CRC not supported\n");
+               PMD_INIT_LOG(INFO, "strip CRC not supported");
                return -EINVAL;
        }
 
        if (rxmode->enable_scatter) {
-               PMD_INIT_LOG(INFO, "Scatter not supported\n");
+               PMD_INIT_LOG(INFO, "Scatter not supported");
                return -EINVAL;
        }
 
@@ -628,16 +625,58 @@ static void nfp_net_read_mac(struct nfp_net_hw *hw)
        memcpy(&hw->mac_addr[4], &tmp, 2);
 }
 
+static int
+nfp_configure_rx_interrupt(struct rte_eth_dev *dev,
+                          struct rte_intr_handle *intr_handle)
+{
+       struct nfp_net_hw *hw;
+       int i;
+
+       if (!intr_handle->intr_vec) {
+               intr_handle->intr_vec =
+                       rte_zmalloc("intr_vec",
+                                   dev->data->nb_rx_queues * sizeof(int), 0);
+               if (!intr_handle->intr_vec) {
+                       PMD_INIT_LOG(ERR, "Failed to allocate %d rx_queues"
+                                    " intr_vec", dev->data->nb_rx_queues);
+                       return -ENOMEM;
+               }
+       }
+
+       hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       if (intr_handle->type == RTE_INTR_HANDLE_UIO) {
+               PMD_INIT_LOG(INFO, "VF: enabling RX interrupt with UIO");
+               /* UIO just supports one queue and no LSC*/
+               nn_cfg_writeb(hw, NFP_NET_CFG_RXR_VEC(0), 0);
+       } else {
+               PMD_INIT_LOG(INFO, "VF: enabling RX interrupt with VFIO");
+               for (i = 0; i < dev->data->nb_rx_queues; i++)
+                       /*
+                        * The first msix vector is reserved for non
+                        * efd interrupts
+                       */
+                       nn_cfg_writeb(hw, NFP_NET_CFG_RXR_VEC(i), i + 1);
+       }
+
+       /* Avoiding TX interrupts */
+       hw->ctrl |= NFP_NET_CFG_CTRL_MSIX_TX_OFF;
+       return 0;
+}
+
 static int
 nfp_net_start(struct rte_eth_dev *dev)
 {
+       struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device);
+       struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
        uint32_t new_ctrl, update = 0;
        struct nfp_net_hw *hw;
+       uint32_t intr_vector;
        int ret;
 
        hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-       PMD_INIT_LOG(DEBUG, "Start\n");
+       PMD_INIT_LOG(DEBUG, "Start");
 
        /* Disabling queues just in case... */
        nfp_net_disable_queues(dev);
@@ -648,10 +687,39 @@ nfp_net_start(struct rte_eth_dev *dev)
        /* Enabling the required queues in the device */
        nfp_net_enable_queues(dev);
 
+       /* check and configure queue intr-vector mapping */
+       if (dev->data->dev_conf.intr_conf.rxq != 0) {
+               if (intr_handle->type == RTE_INTR_HANDLE_UIO) {
+                       /*
+                        * Better not to share LSC with RX interrupts.
+                        * Unregistering LSC interrupt handler
+                        */
+                       rte_intr_callback_unregister(&pci_dev->intr_handle,
+                               nfp_net_dev_interrupt_handler, (void *)dev);
+
+                       if (dev->data->nb_rx_queues > 1) {
+                               PMD_INIT_LOG(ERR, "PMD rx interrupt only "
+                                            "supports 1 queue with UIO");
+                               return -EIO;
+                       }
+               }
+               intr_vector = dev->data->nb_rx_queues;
+               if (rte_intr_efd_enable(intr_handle, intr_vector))
+                       return -1;
+       }
+
+       nfp_configure_rx_interrupt(dev, intr_handle);
+
+       rte_intr_enable(intr_handle);
+
        /* Enable device */
-       new_ctrl = hw->ctrl | NFP_NET_CFG_CTRL_ENABLE | NFP_NET_CFG_UPDATE_MSIX;
+       new_ctrl = hw->ctrl | NFP_NET_CFG_CTRL_ENABLE;
        update = NFP_NET_CFG_UPDATE_GEN | NFP_NET_CFG_UPDATE_RING;
 
+       /* Just configuring queues interrupts when necessary */
+       if (rte_intr_dp_is_en(intr_handle))
+               update |= NFP_NET_CFG_UPDATE_MSIX;
+
        if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG)
                new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG;
 
@@ -697,7 +765,7 @@ nfp_net_stop(struct rte_eth_dev *dev)
 {
        int i;
 
-       PMD_INIT_LOG(DEBUG, "Stop\n");
+       PMD_INIT_LOG(DEBUG, "Stop");
 
        nfp_net_disable_queues(dev);
 
@@ -720,7 +788,7 @@ nfp_net_close(struct rte_eth_dev *dev)
        struct nfp_net_hw *hw;
        struct rte_pci_device *pci_dev;
 
-       PMD_INIT_LOG(DEBUG, "Close\n");
+       PMD_INIT_LOG(DEBUG, "Close");
 
        hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        pci_dev = RTE_DEV_TO_PCI(dev->device);
@@ -757,7 +825,7 @@ nfp_net_promisc_enable(struct rte_eth_dev *dev)
        hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        if (!(hw->cap & NFP_NET_CFG_CTRL_PROMISC)) {
-               PMD_INIT_LOG(INFO, "Promiscuous mode not supported\n");
+               PMD_INIT_LOG(INFO, "Promiscuous mode not supported");
                return;
        }
 
@@ -1084,6 +1152,9 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->speed_capa = ETH_SPEED_NUM_1G | ETH_LINK_SPEED_10G |
                               ETH_SPEED_NUM_25G | ETH_SPEED_NUM_40G |
                               ETH_SPEED_NUM_50G | ETH_LINK_SPEED_100G;
+
+       if (hw->cap & NFP_NET_CFG_CTRL_LSO)
+               dev_info->tx_offload_capa |= DEV_TX_OFFLOAD_TCP_TSO;
 }
 
 static const uint32_t *
@@ -1114,12 +1185,11 @@ nfp_net_rx_queue_count(struct rte_eth_dev *dev, uint16_t queue_idx)
        rxq = (struct nfp_net_rxq *)dev->data->rx_queues[queue_idx];
 
        if (rxq == NULL) {
-               PMD_INIT_LOG(ERR, "Bad queue: %u\n", queue_idx);
+               PMD_INIT_LOG(ERR, "Bad queue: %u", queue_idx);
                return 0;
        }
 
-       idx = rxq->rd_p % rxq->rx_count;
-       rxds = &rxq->rxds[idx];
+       idx = rxq->rd_p;
 
        count = 0;
 
@@ -1147,6 +1217,45 @@ nfp_net_rx_queue_count(struct rte_eth_dev *dev, uint16_t queue_idx)
        return count;
 }
 
+static int
+nfp_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
+{
+       struct rte_pci_device *pci_dev;
+       struct nfp_net_hw *hw;
+       int base = 0;
+
+       hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       pci_dev = RTE_DEV_TO_PCI(dev->device);
+
+       if (pci_dev->intr_handle.type != RTE_INTR_HANDLE_UIO)
+               base = 1;
+
+       /* Make sure all updates are written before un-masking */
+       rte_wmb();
+       nn_cfg_writeb(hw, NFP_NET_CFG_ICR(base + queue_id),
+                     NFP_NET_CFG_ICR_UNMASKED);
+       return 0;
+}
+
+static int
+nfp_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
+{
+       struct rte_pci_device *pci_dev;
+       struct nfp_net_hw *hw;
+       int base = 0;
+
+       hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       pci_dev = RTE_DEV_TO_PCI(dev->device);
+
+       if (pci_dev->intr_handle.type != RTE_INTR_HANDLE_UIO)
+               base = 1;
+
+       /* Make sure all updates are written before un-masking */
+       rte_wmb();
+       nn_cfg_writeb(hw, NFP_NET_CFG_ICR(base + queue_id), 0x1);
+       return 0;
+}
+
 static void
 nfp_net_dev_link_status_print(struct rte_eth_dev *dev)
 {
@@ -1421,8 +1530,6 @@ nfp_net_rx_fill_freelist(struct nfp_net_rxq *rxq)
                rxd->fld.dma_addr_lo = dma_addr & 0xffffffff;
                rxe[i].mbuf = mbuf;
                PMD_RX_LOG(DEBUG, "[%d]: %" PRIx64 "\n", i, dma_addr);
-
-               rxq->wr_p++;
        }
 
        /* Make sure all writes are flushed before telling the hardware */
@@ -1506,7 +1613,6 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        }
 
        txq->tx_count = nb_desc;
-       txq->tail = 0;
        txq->tx_free_thresh = tx_free_thresh;
        txq->tx_pthresh = tx_conf->tx_thresh.pthresh;
        txq->tx_hthresh = tx_conf->tx_thresh.hthresh;
@@ -1550,6 +1656,27 @@ nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        return 0;
 }
 
+/* nfp_net_tx_tso - Set TX descriptor for TSO */
+static inline void
+nfp_net_tx_tso(struct nfp_net_txq *txq, struct nfp_net_tx_desc *txd,
+              struct rte_mbuf *mb)
+{
+       uint64_t ol_flags;
+       struct nfp_net_hw *hw = txq->hw;
+
+       if (!(hw->cap & NFP_NET_CFG_CTRL_LSO))
+               return;
+
+       ol_flags = mb->ol_flags;
+
+       if (!(ol_flags & PKT_TX_TCP_SEG))
+               return;
+
+       txd->l4_offset = mb->l2_len + mb->l3_len + mb->l4_len;
+       txd->lso = rte_cpu_to_le_16(mb->tso_segsz);
+       txd->flags |= PCIE_DESC_TX_LSO;
+}
+
 /* nfp_net_tx_cksum - Set TX CSUM offload flags in TX descriptor */
 static inline void
 nfp_net_tx_cksum(struct nfp_net_txq *txq, struct nfp_net_tx_desc *txd,
@@ -1698,7 +1825,6 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        struct nfp_net_hw *hw;
        struct rte_mbuf *mb;
        struct rte_mbuf *new_mb;
-       int idx;
        uint16_t nb_hold;
        uint64_t dma_addr;
        int avail;
@@ -1718,9 +1844,7 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        nb_hold = 0;
 
        while (avail < nb_pkts) {
-               idx = rxq->rd_p % rxq->rx_count;
-
-               rxb = &rxq->rxbufs[idx];
+               rxb = &rxq->rxbufs[rxq->rd_p];
                if (unlikely(rxb == NULL)) {
                        RTE_LOG_DP(ERR, PMD, "rxb does not exist!\n");
                        break;
@@ -1732,7 +1856,7 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                 */
                rte_rmb();
 
-               rxds = &rxq->rxds[idx];
+               rxds = &rxq->rxds[rxq->rd_p];
                if ((rxds->rxd.meta_len_dd & PCIE_DESC_RX_DD) == 0)
                        break;
 
@@ -1820,6 +1944,8 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                rxds->fld.dma_addr_lo = dma_addr & 0xffffffff;
 
                rxq->rd_p++;
+               if (unlikely(rxq->rd_p == rxq->rx_count)) /* wrapping?*/
+                       rxq->rd_p = 0;
        }
 
        if (nb_hold == 0)
@@ -1865,33 +1991,40 @@ nfp_net_tx_free_bufs(struct nfp_net_txq *txq)
        /* Work out how many packets have been sent */
        qcp_rd_p = nfp_qcp_read(txq->qcp_q, NFP_QCP_READ_PTR);
 
-       if (qcp_rd_p == txq->qcp_rd_p) {
+       if (qcp_rd_p == txq->rd_p) {
                PMD_TX_LOG(DEBUG, "queue %u: It seems harrier is not sending "
                           "packets (%u, %u)\n", txq->qidx,
-                          qcp_rd_p, txq->qcp_rd_p);
+                          qcp_rd_p, txq->rd_p);
                return 0;
        }
 
-       if (qcp_rd_p > txq->qcp_rd_p)
-               todo = qcp_rd_p - txq->qcp_rd_p;
+       if (qcp_rd_p > txq->rd_p)
+               todo = qcp_rd_p - txq->rd_p;
        else
-               todo = qcp_rd_p + txq->tx_count - txq->qcp_rd_p;
+               todo = qcp_rd_p + txq->tx_count - txq->rd_p;
 
-       PMD_TX_LOG(DEBUG, "qcp_rd_p %u, txq->qcp_rd_p: %u, qcp->rd_p: %u\n",
-                  qcp_rd_p, txq->qcp_rd_p, txq->rd_p);
+       PMD_TX_LOG(DEBUG, "qcp_rd_p %u, txq->rd_p: %u, qcp->rd_p: %u\n",
+                  qcp_rd_p, txq->rd_p, txq->rd_p);
 
        if (todo == 0)
                return todo;
 
-       txq->qcp_rd_p += todo;
-       txq->qcp_rd_p %= txq->tx_count;
        txq->rd_p += todo;
+       if (unlikely(txq->rd_p >= txq->tx_count))
+               txq->rd_p -= txq->tx_count;
 
        return todo;
 }
 
 /* Leaving always free descriptors for avoiding wrapping confusion */
-#define NFP_FREE_TX_DESC(t) (t->tx_count - (t->wr_p - t->rd_p) - 8)
+static inline
+uint32_t nfp_free_tx_desc(struct nfp_net_txq *txq)
+{
+       if (txq->wr_p >= txq->rd_p)
+               return txq->tx_count - (txq->wr_p - txq->rd_p) - 8;
+       else
+               return txq->rd_p - txq->wr_p - 8;
+}
 
 /*
  * nfp_net_txq_full - Check if the TX queue free descriptors
@@ -1902,9 +2035,9 @@ nfp_net_tx_free_bufs(struct nfp_net_txq *txq)
  * This function uses the host copy* of read/write pointers
  */
 static inline
-int nfp_net_txq_full(struct nfp_net_txq *txq)
+uint32_t nfp_net_txq_full(struct nfp_net_txq *txq)
 {
-       return NFP_FREE_TX_DESC(txq) < txq->tx_free_thresh;
+       return (nfp_free_tx_desc(txq) < txq->tx_free_thresh);
 }
 
 static uint16_t
@@ -1912,7 +2045,7 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 {
        struct nfp_net_txq *txq;
        struct nfp_net_hw *hw;
-       struct nfp_net_tx_desc *txds;
+       struct nfp_net_tx_desc *txds, txd;
        struct rte_mbuf *pkt;
        uint64_t dma_addr;
        int pkt_size, dma_size;
@@ -1922,15 +2055,15 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 
        txq = tx_queue;
        hw = txq->hw;
-       txds = &txq->txds[txq->tail];
+       txds = &txq->txds[txq->wr_p];
 
        PMD_TX_LOG(DEBUG, "working for queue %u at pos %d and %u packets\n",
-                  txq->qidx, txq->tail, nb_pkts);
+                  txq->qidx, txq->wr_p, nb_pkts);
 
-       if ((NFP_FREE_TX_DESC(txq) < nb_pkts) || (nfp_net_txq_full(txq)))
+       if ((nfp_free_tx_desc(txq) < nb_pkts) || (nfp_net_txq_full(txq)))
                nfp_net_tx_free_bufs(txq);
 
-       free_descs = (uint16_t)NFP_FREE_TX_DESC(txq);
+       free_descs = (uint16_t)nfp_free_tx_desc(txq);
        if (unlikely(free_descs == 0))
                return 0;
 
@@ -1943,7 +2076,7 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
        /* Sending packets */
        while ((i < nb_pkts) && free_descs) {
                /* Grabbing the mbuf linked to the current descriptor */
-               lmbuf = &txq->txbufs[txq->tail].mbuf;
+               lmbuf = &txq->txbufs[txq->wr_p].mbuf;
                /* Warming the cache for releasing the mbuf later on */
                RTE_MBUF_PREFETCH_TO_FREE(*lmbuf);
 
@@ -1951,7 +2084,7 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 
                if (unlikely((pkt->nb_segs > 1) &&
                             !(hw->cap & NFP_NET_CFG_CTRL_GATHER))) {
-                       PMD_INIT_LOG(INFO, "NFP_NET_CFG_CTRL_GATHER not set\n");
+                       PMD_INIT_LOG(INFO, "NFP_NET_CFG_CTRL_GATHER not set");
                        rte_panic("Multisegment packet unsupported\n");
                }
 
@@ -1961,19 +2094,17 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 
                /*
                 * Checksum and VLAN flags just in the first descriptor for a
-                * multisegment packet
+                * multisegment packet, but TSO info needs to be in all of them.
                 */
-               nfp_net_tx_cksum(txq, txds, pkt);
+               nfp_net_tx_tso(txq, &txd, pkt);
+               nfp_net_tx_cksum(txq, &txd, pkt);
 
                if ((pkt->ol_flags & PKT_TX_VLAN_PKT) &&
                    (hw->cap & NFP_NET_CFG_CTRL_TXVLAN)) {
-                       txds->flags |= PCIE_DESC_TX_VLAN;
-                       txds->vlan = pkt->vlan_tci;
+                       txd.flags |= PCIE_DESC_TX_VLAN;
+                       txd.vlan = pkt->vlan_tci;
                }
 
-               if (pkt->ol_flags & PKT_TX_TCP_SEG)
-                       rte_panic("TSO is not supported\n");
-
                /*
                 * mbuf data_len is the data in one segment and pkt_len data
                 * in the whole packet. When the packet is just one segment,
@@ -1991,6 +2122,8 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                *lmbuf = pkt;
 
                while (pkt_size) {
+                       /* Copying TSO, VLAN and cksum info */
+                       *txds = txd;
                        dma_size = pkt->data_len;
                        dma_addr = rte_mbuf_data_dma_addr(pkt);
                        PMD_TX_LOG(DEBUG, "Working with mbuf at dma address:"
@@ -2005,9 +2138,8 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                        free_descs--;
 
                        txq->wr_p++;
-                       txq->tail++;
-                       if (unlikely(txq->tail == txq->tx_count)) /* wrapping?*/
-                               txq->tail = 0;
+                       if (unlikely(txq->wr_p == txq->tx_count)) /* wrapping?*/
+                               txq->wr_p = 0;
 
                        pkt_size -= dma_size;
                        if (!pkt_size) {
@@ -2018,7 +2150,7 @@ nfp_net_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
                                pkt = pkt->next;
                        }
                        /* Referencing next free TX descriptor */
-                       txds = &txq->txds[txq->tail];
+                       txds = &txq->txds[txq->wr_p];
                        issued_descs++;
                }
                i++;
@@ -2042,9 +2174,9 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask)
        new_ctrl = 0;
 
        if ((mask & ETH_VLAN_FILTER_OFFLOAD) ||
-           (mask & ETH_VLAN_FILTER_OFFLOAD))
-               RTE_LOG(INFO, PMD, "Not support for ETH_VLAN_FILTER_OFFLOAD or"
-                       " ETH_VLAN_FILTER_EXTEND");
+           (mask & ETH_VLAN_EXTEND_OFFLOAD))
+               RTE_LOG(INFO, PMD, "No support for ETH_VLAN_FILTER_OFFLOAD or"
+                       " ETH_VLAN_EXTEND_OFFLOAD");
 
        /* Enable vlan strip if it is not configured yet */
        if ((mask & ETH_VLAN_STRIP_OFFLOAD) &&
@@ -2305,6 +2437,8 @@ static const struct eth_dev_ops nfp_net_eth_dev_ops = {
        .rx_queue_count         = nfp_net_rx_queue_count,
        .tx_queue_setup         = nfp_net_tx_queue_setup,
        .tx_queue_release       = nfp_net_tx_queue_release,
+       .rx_queue_intr_enable   = nfp_rx_queue_intr_enable,
+       .rx_queue_intr_disable  = nfp_rx_queue_intr_disable,
 };
 
 static int
@@ -2338,7 +2472,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
        hw->subsystem_device_id = pci_dev->id.subsystem_device_id;
        hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id;
 
-       PMD_INIT_LOG(DEBUG, "nfp_net: device (%u:%u) %u:%u:%u:%u\n",
+       PMD_INIT_LOG(DEBUG, "nfp_net: device (%u:%u) %u:%u:%u:%u",
                     pci_dev->id.vendor_id, pci_dev->id.device_id,
                     pci_dev->addr.domain, pci_dev->addr.bus,
                     pci_dev->addr.devid, pci_dev->addr.function);
@@ -2365,13 +2499,13 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
                return -ENODEV;
        }
 
-       PMD_INIT_LOG(DEBUG, "tx_bar_off: 0x%08x\n", tx_bar_off);
-       PMD_INIT_LOG(DEBUG, "rx_bar_off: 0x%08x\n", rx_bar_off);
+       PMD_INIT_LOG(DEBUG, "tx_bar_off: 0x%08x", tx_bar_off);
+       PMD_INIT_LOG(DEBUG, "rx_bar_off: 0x%08x", rx_bar_off);
 
        hw->tx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + tx_bar_off;
        hw->rx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + rx_bar_off;
 
-       PMD_INIT_LOG(DEBUG, "ctrl_bar: %p, tx_bar: %p, rx_bar: %p\n",
+       PMD_INIT_LOG(DEBUG, "ctrl_bar: %p, tx_bar: %p, rx_bar: %p",
                     hw->ctrl_bar, hw->tx_bar, hw->rx_bar);
 
        nfp_net_cfg_queue_setup(hw);
@@ -2387,9 +2521,9 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
        else
                hw->rx_offset = nn_cfg_readl(hw, NFP_NET_CFG_RX_OFFSET_ADDR);
 
-       PMD_INIT_LOG(INFO, "VER: %#x, Maximum supported MTU: %d\n",
+       PMD_INIT_LOG(INFO, "VER: %#x, Maximum supported MTU: %d",
                     hw->ver, hw->max_mtu);
-       PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s\n", hw->cap,
+       PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s", hw->cap,
                     hw->cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "",
                     hw->cap & NFP_NET_CFG_CTRL_RXCSUM  ? "RXCSUM "  : "",
                     hw->cap & NFP_NET_CFG_CTRL_TXCSUM  ? "TXCSUM "  : "",
@@ -2405,7 +2539,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
        hw->stride_rx = stride;
        hw->stride_tx = stride;
 
-       PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u\n",
+       PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u",
                     hw->max_rx_queues, hw->max_tx_queues);
 
        /* Initializing spinlock for reconfigs */
@@ -2440,9 +2574,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
                                   nfp_net_dev_interrupt_handler,
                                   (void *)eth_dev);
 
-       /* enable uio intr after callback register */
-       rte_intr_enable(&pci_dev->intr_handle);
-
        /* Telling the firmware about the LSC interrupt entry */
        nn_cfg_writeb(hw, NFP_NET_CFG_LSC, NFP_NET_IRQ_LSC_IDX);
 
@@ -2452,7 +2583,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
        return 0;
 }
 
-static struct rte_pci_id pci_id_nfp_net_map[] = {
+static const struct rte_pci_id pci_id_nfp_net_map[] = {
        {
                RTE_PCI_DEVICE(PCI_VENDOR_ID_NETRONOME,
                               PCI_DEVICE_ID_NFP6000_PF_NIC)