Commit 47ab2c12 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'correct-bd-length-masks-and-bql-accounting-for-multi-bd-tx-packets' 

Suraj Gupta says:

====================
Correct BD length masks and BQL accounting for multi-BD TX packets

This patch series fixes two issues in the Xilinx AXI Ethernet driver:
 1. Corrects the BD length masks to match the AXIDMA IP spec.
 2. Fixes BQL accounting for multi-BD TX packets.
====================

Link: https://patch.msgid.link/20260327073238.134948-1-suraj.gupta2@amd.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 30fe3f5f d1978d03

drivers/net/ethernet/xilinx/xilinx_axienet.h

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
#define XAXIDMA_BD_HAS_DRE_MASK		0xF00 /* Whether has DRE mask */

#define XAXIDMA_BD_WORDLEN_MASK		0xFF /* Whether has DRE mask */



#define XAXIDMA_BD_CTRL_LENGTH_MASK	0x007FFFFF /* Requested len */

#define XAXIDMA_BD_CTRL_LENGTH_MASK	GENMASK(25, 0) /* Requested len */

#define XAXIDMA_BD_CTRL_TXSOF_MASK	0x08000000 /* First tx packet */

#define XAXIDMA_BD_CTRL_TXEOF_MASK	0x04000000 /* Last tx packet */

#define XAXIDMA_BD_CTRL_ALL_MASK	0x0C000000 /* All control bits */
@@ -130,7 +130,7 @@ 
#define XAXIDMA_BD_CTRL_TXEOF_MASK	0x04000000 /* Last tx packet */

#define XAXIDMA_BD_CTRL_ALL_MASK	0x0C000000 /* All control bits */



#define XAXIDMA_BD_STS_ACTUAL_LEN_MASK	0x007FFFFF /* Actual len */

#define XAXIDMA_BD_STS_ACTUAL_LEN_MASK	GENMASK(25, 0) /* Actual len */

#define XAXIDMA_BD_STS_COMPLETE_MASK	0x80000000 /* Completed */

#define XAXIDMA_BD_STS_DEC_ERR_MASK	0x40000000 /* Decode error */

#define XAXIDMA_BD_STS_SLV_ERR_MASK	0x20000000 /* Slave error */

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+4 −5
Original line number Diff line number Diff line
@@ -770,8 +770,8 @@ static int axienet_device_reset(struct net_device *ndev) 
 * @first_bd:	Index of first descriptor to clean up

 * @nr_bds:	Max number of descriptors to clean up

 * @force:	Whether to clean descriptors even if not complete

 * @sizep:	Pointer to a u32 filled with the total sum of all bytes

 *		in all cleaned-up descriptors. Ignored if NULL.

 * @sizep:	Pointer to a u32 accumulating the total byte count of

 *		completed packets (using skb->len). Ignored if NULL.

 * @budget:	NAPI budget (use 0 when not called from NAPI poll)

 *

 * Would either be called after a successful transmit operation, or after
@@ -805,6 +805,8 @@ static int axienet_free_tx_chain(struct axienet_local *lp, u32 first_bd, 
				 DMA_TO_DEVICE);



		if (cur_p->skb && (status & XAXIDMA_BD_STS_COMPLETE_MASK)) {

			if (sizep)

				*sizep += cur_p->skb->len;

			napi_consume_skb(cur_p->skb, budget);

			packets++;

		}
@@ -818,9 +820,6 @@ static int axienet_free_tx_chain(struct axienet_local *lp, u32 first_bd, 
		wmb();

		cur_p->cntrl = 0;

		cur_p->status = 0;



		if (sizep)

			*sizep += status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK;

	}



	if (!force) {