Commit 357951cd authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: Uniformize set_rx_owner() 



Currently an if condition is used to select the correct callback to set
rx_onwer in descriptor. Lets keep this simple and always use the same
callback.

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 f1565c60

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

+6 −6
Original line number Diff line number Diff line
@@ -189,9 +189,12 @@ static void dwmac4_set_tx_owner(struct dma_desc *p) 
	p->des3 |= cpu_to_le32(TDES3_OWN);

}



static void dwmac4_set_rx_owner(struct dma_desc *p)

static void dwmac4_set_rx_owner(struct dma_desc *p, int disable_rx_ic)

{

	p->des3 |= cpu_to_le32(RDES3_OWN);

	p->des3 = cpu_to_le32(RDES3_OWN | RDES3_BUFFER1_VALID_ADDR);



	if (!disable_rx_ic)

		p->des3 |= cpu_to_le32(RDES3_INT_ON_COMPLETION_EN);

}



static int dwmac4_get_tx_ls(struct dma_desc *p)
@@ -292,10 +295,7 @@ exit: 
static void dwmac4_rd_init_rx_desc(struct dma_desc *p, int disable_rx_ic,

				   int mode, int end)

{

	p->des3 = cpu_to_le32(RDES3_OWN | RDES3_BUFFER1_VALID_ADDR);



	if (!disable_rx_ic)

		p->des3 |= cpu_to_le32(RDES3_INT_ON_COMPLETION_EN);

	dwmac4_set_rx_owner(p, disable_rx_ic);

}



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

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

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void enh_desc_set_tx_owner(struct dma_desc *p) 
	p->des0 |= cpu_to_le32(ETDES0_OWN);

}



static void enh_desc_set_rx_owner(struct dma_desc *p)

static void enh_desc_set_rx_owner(struct dma_desc *p, int disable_rx_ic)

{

	p->des0 |= cpu_to_le32(RDES0_OWN);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct stmmac_desc_ops { 
	/* Get the buffer size from the descriptor */

	int (*get_tx_len)(struct dma_desc *p);

	/* Handle extra events on specific interrupts hw dependent */

	void (*set_rx_owner)(struct dma_desc *p);

	void (*set_rx_owner)(struct dma_desc *p, int disable_rx_ic);

	/* Get the receive frame size */

	int (*get_rx_frame_len)(struct dma_desc *p, int rx_coe_type);

	/* Return the reception status looking at the RDES1 */

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

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void ndesc_set_tx_owner(struct dma_desc *p) 
	p->des0 |= cpu_to_le32(TDES0_OWN);

}



static void ndesc_set_rx_owner(struct dma_desc *p)

static void ndesc_set_rx_owner(struct dma_desc *p, int disable_rx_ic)

{

	p->des0 |= cpu_to_le32(RDES0_OWN);

}

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

+1 −4
Original line number Diff line number Diff line
@@ -3262,10 +3262,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue) 
		}

		dma_wmb();



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

			stmmac_init_rx_desc(priv, p, priv->use_riwt, 0, 0);

		else

			stmmac_set_rx_owner(priv, p);

		stmmac_set_rx_owner(priv, p, priv->use_riwt);



		dma_wmb();

CRA Git | Maintained and supported by SUSTech CRA and CCSE