1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 074259cc8e06..9179a99563af 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -1498,7 +1498,7 @@ nfp_net_tx_xdp_buf(struct nfp_net *nn, struct nfp_net_rx_ring *rx_ring,
         txbuf->real_len = pkt_len;
 
         dma_sync_single_for_device(&nn->pdev->dev, rxbuf->dma_addr + pkt_off,
-                                   pkt_len, DMA_TO_DEVICE);
+                                   pkt_len, DMA_BIDIRECTIONAL);
 
         /* Build TX descriptor */
         txd = &tx_ring->txds[wr_idx];
@@ -1611,7 +1611,7 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget)
 
                         dma_sync_single_for_cpu(&nn->pdev->dev,
                                                 rxbuf->dma_addr + pkt_off,
-                                                pkt_len, DMA_FROM_DEVICE);
+                                                pkt_len, DMA_BIDIRECTIONAL);
                         act = nfp_net_run_xdp(xdp_prog, rxbuf->frag + data_off,
                                               pkt_len);
                         switch (act) {
@@ -2198,7 +2198,8 @@ static int __nfp_net_set_config_and_enable(struct nfp_net *nn)
         nfp_net_write_mac_addr(nn);
 
         nn_writel(nn, NFP_NET_CFG_MTU, nn->netdev->mtu);
-        nn_writel(nn, NFP_NET_CFG_FLBUFSZ, nn->fl_bufsz);
+        nn_writel(nn, NFP_NET_CFG_FLBUFSZ,
+                  nn->fl_bufsz - NFP_NET_RX_BUF_NON_DATA);
 
         /* Enable device */
         new_ctrl |= NFP_NET_CFG_CTRL_ENABLE;