Commit b56fae33 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-stmmac-descriptor-cleanups-part-2' 

Russell King says:

====================
net: stmmac: descriptor cleanups part 2

Part 2 of the stmmac descriptor cleanups.

- rename "priv->mode" to be more descriptive, and do the same in
  function arguments.
- simplify descriptor allocation/initialisation/freeing
- use more descriptive local variable names in stmmac_xmit()
- STMMAC_GET_ENTRY() doesn't get an entry, it moves to the next one.
  Describe this in the macro name.
====================

Link: https://patch.msgid.link/abruRQpjLyMkoUEP@shell.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b29580d5 6b4286e0

drivers/net/ethernet/stmicro/stmmac/chain_mode.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int jumbo_frm(struct stmmac_tx_queue *tx_q, struct sk_buff *skb, 


	while (len != 0) {

		tx_q->tx_skbuff[entry] = NULL;

		entry = STMMAC_GET_ENTRY(entry, priv->dma_conf.dma_tx_size);

		entry = STMMAC_NEXT_ENTRY(entry, priv->dma_conf.dma_tx_size);

		desc = tx_q->dma_tx + entry;



		if (len > bmax) {

drivers/net/ethernet/stmicro/stmmac/common.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static inline bool dwmac_is_xmac(enum dwmac_core_type core_type) 
#define DMA_MIN_RX_SIZE		64

#define DMA_MAX_RX_SIZE		1024

#define DMA_DEFAULT_RX_SIZE	512

#define STMMAC_GET_ENTRY(x, size)	((x + 1) & (size - 1))

#define STMMAC_NEXT_ENTRY(x, size)	((x + 1) & (size - 1))



#undef FRAME_FILTER_DEBUG

/* #define FRAME_FILTER_DEBUG */

drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c

+7 −5
Original line number Diff line number Diff line
@@ -289,12 +289,13 @@ static int dwmac4_wrback_get_rx_timestamp_status(void *desc, void *next_desc, 
}



static void dwmac4_rd_init_rx_desc(struct dma_desc *p, int disable_rx_ic,

				   int mode, int end, int bfsize)

				   u8 descriptor_mode, int end, int bfsize)

{

	dwmac4_set_rx_owner(p, disable_rx_ic);

}



static void dwmac4_rd_init_tx_desc(struct dma_desc *p, int mode, int end)

static void dwmac4_rd_init_tx_desc(struct dma_desc *p, u8 descriptor_mode,

				   int end)

{

	p->des0 = 0;

	p->des1 = 0;
@@ -303,8 +304,9 @@ static void dwmac4_rd_init_tx_desc(struct dma_desc *p, int mode, int end) 
}



static void dwmac4_rd_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,

				      bool csum_flag, int mode, bool tx_own,

				      bool ls, unsigned int tot_pkt_len)

				      bool csum_flag, u8 descriptor_mode,

				      bool tx_own, bool ls,

				      unsigned int tot_pkt_len)

{

	u32 tdes3 = le32_to_cpu(p->des3);
@@ -381,7 +383,7 @@ static void dwmac4_rd_prepare_tso_tx_desc(struct dma_desc *p, int is_fs, 
	p->des3 = cpu_to_le32(tdes3);

}



static void dwmac4_release_tx_desc(struct dma_desc *p, int mode)

static void dwmac4_release_tx_desc(struct dma_desc *p, u8 descriptor_mode)

{

	p->des0 = 0;

	p->des1 = 0;

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c

+7 −5
Original line number Diff line number Diff line
@@ -130,12 +130,13 @@ static int dwxgmac2_get_rx_timestamp_status(void *desc, void *next_desc, 
}



static void dwxgmac2_init_rx_desc(struct dma_desc *p, int disable_rx_ic,

				  int mode, int end, int bfsize)

				  u8 descriptor_mode, int end, int bfsize)

{

	dwxgmac2_set_rx_owner(p, disable_rx_ic);

}



static void dwxgmac2_init_tx_desc(struct dma_desc *p, int mode, int end)

static void dwxgmac2_init_tx_desc(struct dma_desc *p, u8 descriptor_mode,

				  int end)

{

	p->des0 = 0;

	p->des1 = 0;
@@ -144,8 +145,9 @@ static void dwxgmac2_init_tx_desc(struct dma_desc *p, int mode, int end) 
}



static void dwxgmac2_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,

				     bool csum_flag, int mode, bool tx_own,

				     bool ls, unsigned int tot_pkt_len)

				     bool csum_flag, u8 descriptor_mode,

				     bool tx_own, bool ls,

				     unsigned int tot_pkt_len)

{

	u32 tdes3 = le32_to_cpu(p->des3);
@@ -219,7 +221,7 @@ static void dwxgmac2_prepare_tso_tx_desc(struct dma_desc *p, int is_fs, 
	p->des3 = cpu_to_le32(tdes3);

}



static void dwxgmac2_release_tx_desc(struct dma_desc *p, int mode)

static void dwxgmac2_release_tx_desc(struct dma_desc *p, u8 descriptor_mode)

{

	p->des0 = 0;

	p->des1 = 0;

drivers/net/ethernet/stmicro/stmmac/enh_desc.c

+11 −9
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int enh_desc_get_rx_status(struct stmmac_extra_stats *x, 
}



static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,

				  int mode, int end, int bfsize)

				  u8 descriptor_mode, int end, int bfsize)

{

	int bfsize1;
@@ -254,7 +254,7 @@ static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, 
	bfsize1 = min(bfsize, BUF_SIZE_8KiB);

	p->des1 |= cpu_to_le32(bfsize1 & ERDES1_BUFFER1_SIZE_MASK);



	if (mode == STMMAC_CHAIN_MODE)

	if (descriptor_mode == STMMAC_CHAIN_MODE)

		ehn_desc_rx_set_on_chain(p);

	else

		ehn_desc_rx_set_on_ring(p, end, bfsize);
@@ -263,10 +263,11 @@ static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, 
		p->des1 |= cpu_to_le32(ERDES1_DISABLE_IC);

}



static void enh_desc_init_tx_desc(struct dma_desc *p, int mode, int end)

static void enh_desc_init_tx_desc(struct dma_desc *p, u8 descriptor_mode,

				  int end)

{

	p->des0 &= cpu_to_le32(~ETDES0_OWN);

	if (mode == STMMAC_CHAIN_MODE)

	if (descriptor_mode == STMMAC_CHAIN_MODE)

		enh_desc_end_tx_desc_on_chain(p);

	else

		enh_desc_end_tx_desc_on_ring(p, end);
@@ -282,24 +283,25 @@ static void enh_desc_set_rx_owner(struct dma_desc *p, int disable_rx_ic) 
	p->des0 |= cpu_to_le32(RDES0_OWN);

}



static void enh_desc_release_tx_desc(struct dma_desc *p, int mode)

static void enh_desc_release_tx_desc(struct dma_desc *p, u8 descriptor_mode)

{

	int ter = (le32_to_cpu(p->des0) & ETDES0_END_RING) >> 21;



	memset(p, 0, offsetof(struct dma_desc, des2));

	if (mode == STMMAC_CHAIN_MODE)

	if (descriptor_mode == STMMAC_CHAIN_MODE)

		enh_desc_end_tx_desc_on_chain(p);

	else

		enh_desc_end_tx_desc_on_ring(p, ter);

}



static void enh_desc_prepare_tx_desc(struct dma_desc *p, int is_fs, int len,

				     bool csum_flag, int mode, bool tx_own,

				     bool ls, unsigned int tot_pkt_len)

				     bool csum_flag, u8 descriptor_mode,

				     bool tx_own,  bool ls,

				     unsigned int tot_pkt_len)

{

	u32 tdes0 = le32_to_cpu(p->des0);



	if (mode == STMMAC_CHAIN_MODE)

	if (descriptor_mode == STMMAC_CHAIN_MODE)

		enh_set_tx_desc_len_on_chain(p, len);

	else

		enh_set_tx_desc_len_on_ring(p, len);