OSDN Git Service

net: mvneta: move header prefetch in mvneta_swbm_rx_frame
authorLorenzo Bianconi <lorenzo@kernel.org>
Sat, 19 Oct 2019 08:13:25 +0000 (10:13 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Oct 2019 17:36:07 +0000 (10:36 -0700)
Move data buffer prefetch in mvneta_swbm_rx_frame after
dma_sync_single_range_for_cpu

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/mvneta.c

index 7ca3cd1..64f59ba 100644 (file)
@@ -2025,6 +2025,9 @@ mvneta_swbm_rx_frame(struct mvneta_port *pp,
                                rx_desc->buf_phys_addr,
                                len, dma_dir);
 
+       /* Prefetch header */
+       prefetch(data);
+
        xdp->data_hard_start = data;
        xdp->data = data + MVNETA_SKB_HEADROOM + MVNETA_MH_SIZE;
        xdp->data_end = xdp->data + data_len;
@@ -2122,14 +2125,10 @@ static int mvneta_rx_swbm(struct napi_struct *napi,
        while (rx_proc < budget && rx_proc < rx_todo) {
                struct mvneta_rx_desc *rx_desc = mvneta_rxq_next_desc_get(rxq);
                u32 rx_status, index;
-               unsigned char *data;
                struct page *page;
 
                index = rx_desc - rxq->descs;
                page = (struct page *)rxq->buf_virt_addr[index];
-               data = page_address(page);
-               /* Prefetch header */
-               prefetch(data);
 
                rx_status = rx_desc->status;
                rx_proc++;