net: add rte prefix to ether structures

[dpdk.git] / drivers / net / dpaa / dpaa_rxtx.c

diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index 2c57741..7f174f7 100644 (file)
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2017 NXP
+ *   Copyright 2017,2019 NXP
  *
  */
 
@@ -198,7 +198,8 @@ static inline void dpaa_eth_packet_info(struct rte_mbuf *m, void *fd_virt_addr)
 
 static inline void dpaa_checksum(struct rte_mbuf *mbuf)
 {
-       struct ether_hdr *eth_hdr = rte_pktmbuf_mtod(mbuf, struct ether_hdr *);
+       struct rte_ether_hdr *eth_hdr =
+               rte_pktmbuf_mtod(mbuf, struct rte_ether_hdr *);
        char *l3_hdr = (char *)eth_hdr + mbuf->l2_len;
        struct ipv4_hdr *ipv4_hdr = (struct ipv4_hdr *)l3_hdr;
        struct ipv6_hdr *ipv6_hdr = (struct ipv6_hdr *)l3_hdr;
@@ -370,10 +371,6 @@ dpaa_eth_fd_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
        if (unlikely(format == qm_fd_sg))
                return dpaa_eth_sg_to_mbuf(fd, ifid);
 
-       ptr = DPAA_MEMPOOL_PTOV(bp_info, qm_fd_addr(fd));
-
-       rte_prefetch0((void *)((uint8_t *)ptr + DEFAULT_RX_ICEOF));
-
        offset = (fd->opaque & DPAA_FD_OFFSET_MASK) >> DPAA_FD_OFFSET_SHIFT;
        length = fd->opaque & DPAA_FD_LENGTH_MASK;
 
@@ -381,8 +378,11 @@ dpaa_eth_fd_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
 
        /* Ignoring case when format != qm_fd_contig */
        dpaa_display_frame(fd);
+       ptr = DPAA_MEMPOOL_PTOV(bp_info, qm_fd_addr(fd));
 
        mbuf = (struct rte_mbuf *)((char *)ptr - bp_info->meta_data_size);
+       /* Prefetch the Parse results and packet data to L1 */
+       rte_prefetch0((void *)((uint8_t *)ptr + DEFAULT_RX_ICEOF));
 
        mbuf->data_off = offset;
        mbuf->data_len = length;
@@ -599,6 +599,10 @@ uint16_t dpaa_eth_queue_rx(void *q,
        int num_rx_bufs, ret;
        uint32_t vdqcr_flags = 0;
 
+       if (unlikely(rte_dpaa_bpid_info == NULL &&
+                               rte_eal_process_type() == RTE_PROC_SECONDARY))
+               rte_dpaa_bpid_info = fq->bp_array;
+
        if (likely(fq->is_static))
                return dpaa_eth_queue_portal_rx(fq, bufs, nb_bufs);