net/bonding: provide default Rx/Tx configuration

[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 ef3a897..ef109a6 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -447,6 +447,12 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
 return 0;
 }
 
+/* This function assumes that caller will be keep the same value for nb_pkts
+ * across calls per queue, if that is not the case, better use non-prefetch
+ * version of rx call.
+ * It will return the packets as requested in previous call without honoring
+ * the current nb_pkts or bufs space.
+ */
 uint16_t
 dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 {
@@ -454,7 +460,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
        struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)queue;
        struct qbman_result *dq_storage, *dq_storage1 = NULL;
        uint32_t fqid = dpaa2_q->fqid;
-       int ret, num_rx = 0;
+       int ret, num_rx = 0, pull_size;
        uint8_t pending, status;
        struct qbman_swp *swp;
        const struct qbman_fd *fd, *next_fd;
@@ -470,18 +476,18 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                }
        }
        swp = DPAA2_PER_LCORE_ETHRX_PORTAL;
-
+       pull_size = (nb_pkts > DPAA2_DQRR_RING_SIZE) ?
+                                              DPAA2_DQRR_RING_SIZE : nb_pkts;
        if (unlikely(!q_storage->active_dqs)) {
                q_storage->toggle = 0;
                dq_storage = q_storage->dq_storage[q_storage->toggle];
-               q_storage->last_num_pkts = (nb_pkts > DPAA2_DQRR_RING_SIZE) ?
-                                              DPAA2_DQRR_RING_SIZE : nb_pkts;
+               q_storage->last_num_pkts = pull_size;
                qbman_pull_desc_clear(&pulldesc);
                qbman_pull_desc_set_numframes(&pulldesc,
                                              q_storage->last_num_pkts);
                qbman_pull_desc_set_fq(&pulldesc, fqid);
                qbman_pull_desc_set_storage(&pulldesc, dq_storage,
-                       (dma_addr_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1);
+                       (uint64_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1);
                if (check_swp_active_dqs(DPAA2_PER_LCORE_ETHRX_DPIO->index)) {
                        while (!qbman_check_command_complete(
                               get_swp_active_dqs(
@@ -514,10 +520,10 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
        q_storage->toggle ^= 1;
        dq_storage1 = q_storage->dq_storage[q_storage->toggle];
        qbman_pull_desc_clear(&pulldesc);
-       qbman_pull_desc_set_numframes(&pulldesc, DPAA2_DQRR_RING_SIZE);
+       qbman_pull_desc_set_numframes(&pulldesc, pull_size);
        qbman_pull_desc_set_fq(&pulldesc, fqid);
        qbman_pull_desc_set_storage(&pulldesc, dq_storage1,
-               (dma_addr_t)(DPAA2_VADDR_TO_IOVA(dq_storage1)), 1);
+               (uint64_t)(DPAA2_VADDR_TO_IOVA(dq_storage1)), 1);
 
        /* Check if the previous issued command is completed.
         * Also seems like the SWP is shared between the Ethernet Driver
@@ -560,7 +566,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                        bufs[num_rx] = eth_fd_to_mbuf(fd);
                bufs[num_rx]->port = dev->data->port_id;
 
-               if (dev->data->dev_conf.rxmode.hw_vlan_strip)
+               if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_VLAN_STRIP)
                        rte_vlan_strip(bufs[num_rx]);
 
                dq_storage++;