net/enic: use dynamic log types

[dpdk.git] / drivers / net / dpaa2 / dpaa2_rxtx.c

diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 6bb2ec0..53466c3 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -24,6 +24,14 @@
 #include "dpaa2_ethdev.h"
 #include "base/dpaa2_hw_dpni_annot.h"
 
+#define DPAA2_MBUF_TO_CONTIG_FD(_mbuf, _fd, _bpid)  do { \
+       DPAA2_SET_FD_ADDR(_fd, DPAA2_MBUF_VADDR_TO_IOVA(_mbuf)); \
+       DPAA2_SET_FD_LEN(_fd, _mbuf->data_len); \
+       DPAA2_SET_ONLY_FD_BPID(_fd, _bpid); \
+       DPAA2_SET_FD_OFFSET(_fd, _mbuf->data_off); \
+       DPAA2_SET_FD_ASAL(_fd, DPAA2_ASAL_VAL); \
+} while (0)
+
 static inline void __attribute__((hot))
 dpaa2_dev_rx_parse_frc(struct rte_mbuf *m, uint16_t frc)
 {
@@ -410,11 +418,7 @@ eth_mbuf_to_fd(struct rte_mbuf *mbuf,
        /*Resetting the buffer pool id and offset field*/
        fd->simple.bpid_offset = 0;
 
-       DPAA2_SET_FD_ADDR(fd, DPAA2_MBUF_VADDR_TO_IOVA(mbuf));
-       DPAA2_SET_FD_LEN(fd, mbuf->data_len);
-       DPAA2_SET_FD_BPID(fd, bpid);
-       DPAA2_SET_FD_OFFSET(fd, mbuf->data_off);
-       DPAA2_SET_FD_ASAL(fd, DPAA2_ASAL_VAL);
+       DPAA2_MBUF_TO_CONTIG_FD(mbuf, fd, bpid);
 
        PMD_TX_LOG(DEBUG, "mbuf =%p, mbuf->buf_addr =%p, off = %d,"
                "fd_off=%d fd =%lx, meta = %d  bpid =%d, len=%d\n",
@@ -471,11 +475,7 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
        /*Resetting the buffer pool id and offset field*/
        fd->simple.bpid_offset = 0;
 
-       DPAA2_SET_FD_ADDR(fd, DPAA2_MBUF_VADDR_TO_IOVA(m));
-       DPAA2_SET_FD_LEN(fd, mbuf->data_len);
-       DPAA2_SET_FD_BPID(fd, bpid);
-       DPAA2_SET_FD_OFFSET(fd, mbuf->data_off);
-       DPAA2_SET_FD_ASAL(fd, DPAA2_ASAL_VAL);
+       DPAA2_MBUF_TO_CONTIG_FD(m, fd, bpid);
 
        PMD_TX_LOG(DEBUG, " mbuf %p BMAN buf addr %p",
                   (void *)mbuf, mbuf->buf_addr);
@@ -500,7 +500,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
        int ret, num_rx = 0;
        uint8_t is_last = 0, status;
        struct qbman_swp *swp;
-       const struct qbman_fd *fd[DPAA2_DQRR_RING_SIZE];
+       const struct qbman_fd *fd[DPAA2_DQRR_RING_SIZE], *next_fd;
        struct qbman_pull_desc pulldesc;
        struct queue_storage_info_t *q_storage = dpaa2_q->q_storage;
        struct rte_eth_dev *dev = dpaa2_q->dev;
@@ -543,6 +543,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                set_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index, dq_storage);
        }
        dq_storage = q_storage->active_dqs;
+       rte_prefetch0((void *)((uint64_t)(dq_storage + 1)));
        /* Check if the previous issued command is completed.
         * Also seems like the SWP is shared between the Ethernet Driver
         * and the SEC driver.
@@ -557,7 +558,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                 */
                while (!qbman_check_new_result(dq_storage))
                        ;
-               rte_prefetch0((void *)((uint64_t)(dq_storage + 1)));
+               rte_prefetch0((void *)((uint64_t)(dq_storage + 2)));
                /* Check whether Last Pull command is Expired and
                 * setting Condition for Loop termination
                 */
@@ -570,8 +571,9 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                }
                fd[num_rx] = qbman_result_DQ_fd(dq_storage);
 
+               next_fd = qbman_result_DQ_fd(dq_storage + 1);
                /* Prefetch Annotation address for the parse results */
-               rte_prefetch0((void *)((uint64_t)DPAA2_GET_FD_ADDR(fd[num_rx])
+               rte_prefetch0((void *)((uint64_t)DPAA2_GET_FD_ADDR(next_fd)
                                + DPAA2_FD_PTA_SIZE + 16));
 
                if (unlikely(DPAA2_FD_GET_FORMAT(fd[num_rx]) == qbman_fd_sg))
@@ -695,8 +697,26 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                        fd_arr[loop].simple.frc = 0;
                        DPAA2_RESET_FD_CTRL((&fd_arr[loop]));
                        DPAA2_SET_FD_FLC((&fd_arr[loop]), NULL);
-                       if (RTE_MBUF_DIRECT(*bufs)) {
+                       if (likely(RTE_MBUF_DIRECT(*bufs))) {
                                mp = (*bufs)->pool;
+                               /* Check the basic scenario and set
+                                * the FD appropriately here itself.
+                                */
+                               if (likely(mp && mp->ops_index ==
+                                   priv->bp_list->dpaa2_ops_index &&
+                                   (*bufs)->nb_segs == 1 &&
+                                   rte_mbuf_refcnt_read((*bufs)) == 1)) {
+                                       if (unlikely((*bufs)->ol_flags
+                                               & PKT_TX_VLAN_PKT)) {
+                                               ret = rte_vlan_insert(bufs);
+                                               if (ret)
+                                                       goto send_n_return;
+                                       }
+                                       DPAA2_MBUF_TO_CONTIG_FD((*bufs),
+                                       &fd_arr[loop], mempool_to_bpid(mp));
+                                       bufs++;
+                                       continue;
+                               }
                        } else {
                                mi = rte_mbuf_from_indirect(*bufs);
                                mp = mi->pool;
@@ -745,9 +765,9 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                }
 
                num_tx += frames_to_send;
-               dpaa2_q->tx_pkts += frames_to_send;
                nb_pkts -= frames_to_send;
        }
+       dpaa2_q->tx_pkts += num_tx;
        return num_tx;
 
 send_n_return:
@@ -760,9 +780,9 @@ send_n_return:
                                                        &fd_arr[i], loop - i);
                }
                num_tx += loop;
-               dpaa2_q->tx_pkts += loop;
        }
 skip_tx:
+       dpaa2_q->tx_pkts += num_tx;
        return num_tx;
 }