Commit 6844171d authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: Let descriptor code set skbuff address 



Stop using if conditions depending on the GMAC version for setting the
the descriptor skbuff address and use instead a helper implemented in
the descriptor files.

Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Vitor Soares <soares@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ae0169f

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

+7 −0
Original line number Diff line number Diff line
@@ -424,6 +424,12 @@ static void dwmac4_set_mss_ctxt(struct dma_desc *p, unsigned int mss) 
	p->des3 = cpu_to_le32(TDES3_CONTEXT_TYPE | TDES3_CTXT_TCMSSV);

}



static void dwmac4_set_addr(struct dma_desc *p, dma_addr_t addr)

{

	p->des0 = cpu_to_le32(addr);

	p->des1 = 0;

}



const struct stmmac_desc_ops dwmac4_desc_ops = {

	.tx_status = dwmac4_wrback_get_tx_status,

	.rx_status = dwmac4_wrback_get_rx_status,
@@ -445,6 +451,7 @@ const struct stmmac_desc_ops dwmac4_desc_ops = { 
	.init_tx_desc = dwmac4_rd_init_tx_desc,

	.display_ring = dwmac4_display_ring,

	.set_mss = dwmac4_set_mss_ctxt,

	.set_addr = dwmac4_set_addr,

};



const struct stmmac_mode_ops dwmac4_ring_mode_ops = { };

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

+6 −0
Original line number Diff line number Diff line
@@ -437,6 +437,11 @@ static void enh_desc_display_ring(void *head, unsigned int size, bool rx) 
	pr_info("\n");

}



static void enh_desc_set_addr(struct dma_desc *p, dma_addr_t addr)

{

	p->des2 = cpu_to_le32(addr);

}



const struct stmmac_desc_ops enh_desc_ops = {

	.tx_status = enh_desc_get_tx_status,

	.rx_status = enh_desc_get_rx_status,
@@ -457,4 +462,5 @@ const struct stmmac_desc_ops enh_desc_ops = { 
	.get_timestamp = enh_desc_get_timestamp,

	.get_rx_timestamp_status = enh_desc_get_rx_timestamp_status,

	.display_ring = enh_desc_display_ring,

	.set_addr = enh_desc_set_addr,

};

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

+4 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ struct stmmac_desc_ops { 
	void (*display_ring)(void *head, unsigned int size, bool rx);

	/* set MSS via context descriptor */

	void (*set_mss)(struct dma_desc *p, unsigned int mss);

	/* set descriptor skbuff address */

	void (*set_addr)(struct dma_desc *p, dma_addr_t addr);

};



#define stmmac_init_rx_desc(__priv, __args...) \
@@ -123,6 +125,8 @@ struct stmmac_desc_ops { 
	stmmac_do_void_callback(__priv, desc, display_ring, __args)

#define stmmac_set_mss(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, set_mss, __args)

#define stmmac_set_desc_addr(__priv, __args...) \

	stmmac_do_void_callback(__priv, desc, set_addr, __args)



struct stmmac_dma_cfg;

struct dma_features;

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

+6 −0
Original line number Diff line number Diff line
@@ -297,6 +297,11 @@ static void ndesc_display_ring(void *head, unsigned int size, bool rx) 
	pr_info("\n");

}



static void ndesc_set_addr(struct dma_desc *p, dma_addr_t addr)

{

	p->des2 = cpu_to_le32(addr);

}



const struct stmmac_desc_ops ndesc_ops = {

	.tx_status = ndesc_get_tx_status,

	.rx_status = ndesc_get_rx_status,
@@ -316,4 +321,5 @@ const struct stmmac_desc_ops ndesc_ops = { 
	.get_timestamp = ndesc_get_timestamp,

	.get_rx_timestamp_status = ndesc_get_rx_timestamp_status,

	.display_ring = ndesc_display_ring,

	.set_addr = ndesc_set_addr,

};

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

+6 −19
Original line number Diff line number Diff line
@@ -1156,10 +1156,7 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p, 
		return -EINVAL;

	}



	if (priv->synopsys_id >= DWMAC_CORE_4_00)

		p->des0 = cpu_to_le32(rx_q->rx_skbuff_dma[i]);

	else

		p->des2 = cpu_to_le32(rx_q->rx_skbuff_dma[i]);

	stmmac_set_desc_addr(priv, p, rx_q->rx_skbuff_dma[i]);



	if (priv->dma_buf_sz == BUF_SIZE_16KiB)

		stmmac_init_desc3(priv, p);
@@ -3100,10 +3097,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) 
			goto dma_map_err; /* should reuse desc w/o issues */



		tx_q->tx_skbuff_dma[entry].buf = des;

		if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00))

			desc->des0 = cpu_to_le32(des);

		else

			desc->des2 = cpu_to_le32(des);



		stmmac_set_desc_addr(priv, desc, des);



		tx_q->tx_skbuff_dma[entry].map_as_page = true;

		tx_q->tx_skbuff_dma[entry].len = len;
@@ -3185,10 +3180,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) 
			goto dma_map_err;



		tx_q->tx_skbuff_dma[first_entry].buf = des;

		if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00))

			first->des0 = cpu_to_le32(des);

		else

			first->des2 = cpu_to_le32(des);



		stmmac_set_desc_addr(priv, first, des);



		tx_q->tx_skbuff_dma[first_entry].len = nopaged_len;

		tx_q->tx_skbuff_dma[first_entry].last_segment = last_segment;
@@ -3302,13 +3295,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue) 
				break;

			}



			if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00)) {

				p->des0 = cpu_to_le32(rx_q->rx_skbuff_dma[entry]);

				p->des1 = 0;

			} else {

				p->des2 = cpu_to_le32(rx_q->rx_skbuff_dma[entry]);

			}



			stmmac_set_desc_addr(priv, p, rx_q->rx_skbuff_dma[entry]);

			stmmac_refill_desc3(priv, rx_q, p);



			if (rx_q->rx_zeroc_thresh > 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE