Rename macb_tx_buff member skb to ptr and introduce macb_tx_buff_type to identify the buffer type macb_tx_buff represents. This is the last preparatory step for xdp xmit support. Signed-off-by: Paolo Valerio --- drivers/net/ethernet/cadence/macb.h | 23 +++++++++++----- drivers/net/ethernet/cadence/macb_main.c | 35 ++++++++++++++---------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 47c25993ad40..09aec2c4f7d4 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -960,19 +960,28 @@ struct macb_dma_desc_ptp { /* Scaled PPM fraction */ #define PPM_FRACTION 16 -/* struct macb_tx_buff - data about an skb which is being transmitted - * @skb: skb currently being transmitted, only set for the last buffer - * of the frame +enum macb_tx_buff_type { + MACB_TYPE_SKB, + MACB_TYPE_XDP_TX, + MACB_TYPE_XDP_NDO, +}; + +/* struct macb_tx_buff - data about an skb or xdp frame which is being + * transmitted. + * @ptr: pointer to skb or xdp frame being transmitted, only set + * for the last buffer for sk_buff * @mapping: DMA address of the skb's fragment buffer * @size: size of the DMA mapped buffer * @mapped_as_page: true when buffer was mapped with skb_frag_dma_map(), * false when buffer was mapped with dma_map_single() + * @type: type of buffer (MACB_TYPE_SKB, MACB_TYPE_XDP_TX, MACB_TYPE_XDP_NDO) */ struct macb_tx_buff { - void *skb; - dma_addr_t mapping; - size_t size; - bool mapped_as_page; + void *ptr; + dma_addr_t mapping; + size_t size; + bool mapped_as_page; + enum macb_tx_buff_type type; }; /* Hardware-collected statistics. Used when updating the network diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 3ffad2ddc349..cd29a80d1dbb 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -969,7 +969,8 @@ static int macb_halt_tx(struct macb *bp) bp, TSR); } -static void macb_tx_unmap(struct macb *bp, struct macb_tx_buff *tx_buff, int budget) +static void macb_tx_unmap(struct macb *bp, struct macb_tx_buff *tx_buff, + int budget) { if (tx_buff->mapping) { if (tx_buff->mapped_as_page) @@ -981,9 +982,9 @@ static void macb_tx_unmap(struct macb *bp, struct macb_tx_buff *tx_buff, int bud tx_buff->mapping = 0; } - if (tx_buff->skb) { - napi_consume_skb(tx_buff->skb, budget); - tx_buff->skb = NULL; + if (tx_buff->ptr) { + napi_consume_skb(tx_buff->ptr, budget); + tx_buff->ptr = NULL; } } @@ -1070,7 +1071,7 @@ static void macb_tx_error_task(struct work_struct *work) desc = macb_tx_desc(queue, tail); ctrl = desc->ctrl; tx_buff = macb_tx_buff(queue, tail); - skb = tx_buff->skb; + skb = tx_buff->ptr; if (ctrl & MACB_BIT(TX_USED)) { /* skb is set for the last buffer of the frame */ @@ -1078,7 +1079,7 @@ static void macb_tx_error_task(struct work_struct *work) macb_tx_unmap(bp, tx_buff, 0); tail++; tx_buff = macb_tx_buff(queue, tail); - skb = tx_buff->skb; + skb = tx_buff->ptr; } /* ctrl still refers to the first buffer descriptor @@ -1206,7 +1207,9 @@ static int macb_tx_complete(struct macb_queue *queue, int budget) /* Process all buffers of the current transmitted frame */ for (;; tail++) { tx_buff = macb_tx_buff(queue, tail); - skb = tx_buff->skb; + + if (tx_buff->type == MACB_TYPE_SKB) + skb = tx_buff->ptr; /* First, update TX stats if needed */ if (skb) { @@ -2166,7 +2169,8 @@ static unsigned int macb_tx_map(struct macb *bp, goto dma_error; /* Save info to properly release resources */ - tx_buff->skb = NULL; + tx_buff->ptr = NULL; + tx_buff->type = MACB_TYPE_SKB; tx_buff->mapping = mapping; tx_buff->size = size; tx_buff->mapped_as_page = false; @@ -2194,7 +2198,8 @@ static unsigned int macb_tx_map(struct macb *bp, goto dma_error; /* Save info to properly release resources */ - tx_buff->skb = NULL; + tx_buff->ptr = NULL; + tx_buff->type = MACB_TYPE_SKB; tx_buff->mapping = mapping; tx_buff->size = size; tx_buff->mapped_as_page = true; @@ -2212,7 +2217,8 @@ static unsigned int macb_tx_map(struct macb *bp, } /* This is the last buffer of the frame: save socket buffer */ - tx_buff->skb = skb; + tx_buff->ptr = skb; + tx_buff->type = MACB_TYPE_SKB; /* Update TX ring: update buffer descriptors in reverse order * to avoid race condition @@ -5096,8 +5102,9 @@ static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb, netif_stop_queue(dev); /* Store packet information (to free when Tx completed) */ - lp->rm9200_txq[desc].skb = skb; + lp->rm9200_txq[desc].ptr = skb; lp->rm9200_txq[desc].size = skb->len; + lp->rm9200_txq[desc].type = MACB_TYPE_SKB; lp->rm9200_txq[desc].mapping = dma_map_single(&lp->pdev->dev, skb->data, skb->len, DMA_TO_DEVICE); if (dma_mapping_error(&lp->pdev->dev, lp->rm9200_txq[desc].mapping)) { @@ -5189,9 +5196,9 @@ static irqreturn_t at91ether_interrupt(int irq, void *dev_id) dev->stats.tx_errors++; desc = 0; - if (lp->rm9200_txq[desc].skb) { - dev_consume_skb_irq(lp->rm9200_txq[desc].skb); - lp->rm9200_txq[desc].skb = NULL; + if (lp->rm9200_txq[desc].ptr) { + dev_consume_skb_irq(lp->rm9200_txq[desc].ptr); + lp->rm9200_txq[desc].ptr = NULL; dma_unmap_single(&lp->pdev->dev, lp->rm9200_txq[desc].mapping, lp->rm9200_txq[desc].size, DMA_TO_DEVICE); dev->stats.tx_packets++; -- 2.52.0