New upstream version 18.08

[deb_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 0dea8e7..168b77e 100644 (file)
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -59,7 +59,7 @@
        } while (0)
 
 #if (defined RTE_LIBRTE_DPAA_DEBUG_DRIVER)
-void dpaa_display_frame(const struct qm_fd *fd)
+static void dpaa_display_frame(const struct qm_fd *fd)
 {
        int ii;
        char *ptr;
@@ -90,11 +90,10 @@ static inline void dpaa_slow_parsing(struct rte_mbuf *m __rte_unused,
        /*TBD:XXX: to be implemented*/
 }
 
-static inline void dpaa_eth_packet_info(struct rte_mbuf *m,
-                                       uint64_t fd_virt_addr)
+static inline void dpaa_eth_packet_info(struct rte_mbuf *m, void *fd_virt_addr)
 {
        struct annotations_t *annot = GET_ANNOTATIONS(fd_virt_addr);
-       uint64_t prs = *((uint64_t *)(&annot->parse)) & DPAA_PARSE_MASK;
+       uint64_t prs = *((uintptr_t *)(&annot->parse)) & DPAA_PARSE_MASK;
 
        DPAA_DP_LOG(DEBUG, " Parsing mbuf: %p with annotations: %p", m, annot);
 
@@ -351,7 +350,7 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
                prev_seg = cur_seg;
        }
 
-       dpaa_eth_packet_info(first_seg, (uint64_t)vaddr);
+       dpaa_eth_packet_info(first_seg, vaddr);
        rte_pktmbuf_free_seg(temp);
 
        return first_seg;
@@ -394,7 +393,7 @@ dpaa_eth_fd_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
        mbuf->ol_flags = 0;
        mbuf->next = NULL;
        rte_mbuf_refcnt_set(mbuf, 1);
-       dpaa_eth_packet_info(mbuf, (uint64_t)mbuf->buf_addr);
+       dpaa_eth_packet_info(mbuf, mbuf->buf_addr);
 
        return mbuf;
 }
@@ -432,7 +431,7 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry **dqrr,
                }
 
                fd = &dqrr[i]->fd;
-               dpaa_intf = fq[i]->dpaa_intf;
+               dpaa_intf = fq[0]->dpaa_intf;
 
                format = (fd->opaque & DPAA_FD_FORMAT_MASK) >>
                                DPAA_FD_FORMAT_SHIFT;
@@ -455,7 +454,7 @@ dpaa_rx_cb(struct qman_fq **fq, struct qm_dqrr_entry **dqrr,
                mbuf->ol_flags = 0;
                mbuf->next = NULL;
                rte_mbuf_refcnt_set(mbuf, 1);
-               dpaa_eth_packet_info(mbuf, (uint64_t)mbuf->buf_addr);
+               dpaa_eth_packet_info(mbuf, mbuf->buf_addr);
        }
 }
 
@@ -561,7 +560,8 @@ uint16_t dpaa_eth_queue_rx(void *q,
        struct qman_fq *fq = q;
        struct qm_dqrr_entry *dq;
        uint32_t num_rx = 0, ifid = ((struct dpaa_if *)fq->dpaa_intf)->ifid;
-       int ret;
+       int num_rx_bufs, ret;
+       uint32_t vdqcr_flags = 0;
 
        if (likely(fq->is_static))
                return dpaa_eth_queue_portal_rx(fq, bufs, nb_bufs);
@@ -574,8 +574,19 @@ uint16_t dpaa_eth_queue_rx(void *q,
                }
        }
 
-       ret = qman_set_vdq(fq, (nb_bufs > DPAA_MAX_DEQUEUE_NUM_FRAMES) ?
-                               DPAA_MAX_DEQUEUE_NUM_FRAMES : nb_bufs);
+       /* Until request for four buffers, we provide exact number of buffers.
+        * Otherwise we do not set the QM_VDQCR_EXACT flag.
+        * Not setting QM_VDQCR_EXACT flag can provide two more buffers than
+        * requested, so we request two less in this case.
+        */
+       if (nb_bufs < 4) {
+               vdqcr_flags = QM_VDQCR_EXACT;
+               num_rx_bufs = nb_bufs;
+       } else {
+               num_rx_bufs = nb_bufs > DPAA_MAX_DEQUEUE_NUM_FRAMES ?
+                       (DPAA_MAX_DEQUEUE_NUM_FRAMES - 2) : (nb_bufs - 2);
+       }
+       ret = qman_set_vdq(fq, num_rx_bufs, vdqcr_flags);
        if (ret)
                return 0;
 
@@ -593,7 +604,7 @@ uint16_t dpaa_eth_queue_rx(void *q,
 static void *dpaa_get_pktbuf(struct dpaa_bp_info *bp_info)
 {
        int ret;
-       uint64_t buf = 0;
+       size_t buf = 0;
        struct bm_buffer bufs;
 
        ret = bman_acquire(bp_info->bp, &bufs, 1, 0);
@@ -602,10 +613,10 @@ static void *dpaa_get_pktbuf(struct dpaa_bp_info *bp_info)
                return (void *)buf;
        }
 
-       DPAA_DP_LOG(DEBUG, "got buffer 0x%lx from pool %d",
+       DPAA_DP_LOG(DEBUG, "got buffer 0x%" PRIx64 " from pool %d",
                    (uint64_t)bufs.addr, bufs.bpid);
 
-       buf = (uint64_t)DPAA_MEMPOOL_PTOV(bp_info, bufs.addr)
+       buf = (size_t)DPAA_MEMPOOL_PTOV(bp_info, bufs.addr)
                                - bp_info->meta_data_size;
        if (!buf)
                goto out;
@@ -826,6 +837,8 @@ tx_on_external_pool(struct qman_fq *txq, struct rte_mbuf *mbuf,
        }
 
        DPAA_MBUF_TO_CONTIG_FD(dmable_mbuf, fd_arr, dpaa_intf->bp_info->bpid);
+       if (mbuf->ol_flags & DPAA_TX_CKSUM_OFFLOAD_MASK)
+               dpaa_unsegmented_checksum(mbuf, fd_arr);
 
        return 0;
 }