Commit b9cde0a8 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: add mixed burst for DMA 



In mixed burst (MB) mode, the AHB master always initiates
the bursts with fixed-size when the DMA requests transfers
of size less than or equal to 16 beats.
This patch adds the MB support and the flag that can be
passed from the platform to select it.
MB mode can also give some benefits in terms of performances
on some platforms.

v2: fixed Coding Style

Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cffb13f4

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

+2 −2
Original line number Diff line number Diff line
@@ -247,8 +247,8 @@ struct stmmac_desc_ops { 


struct stmmac_dma_ops {

	/* DMA core initialization */

	int (*init) (void __iomem *ioaddr, int pbl, int fb, int burst_len,

			u32 dma_tx, u32 dma_rx);

	int (*init) (void __iomem *ioaddr, int pbl, int fb, int mb,

		     int burst_len, u32 dma_tx, u32 dma_rx);

	/* Dump DMA registers */

	void (*dump_regs) (void __iomem *ioaddr);

	/* Set tx/rx threshold in the csr6 register

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

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ enum rx_tx_priority_ratio { 
};



#define DMA_BUS_MODE_FB		0x00010000	/* Fixed burst */

#define DMA_BUS_MODE_MB		0x04000000	/* Mixed burst */

#define DMA_BUS_MODE_RPBL_MASK	0x003e0000	/* Rx-Programmable Burst Len */

#define DMA_BUS_MODE_RPBL_SHIFT	17

#define DMA_BUS_MODE_USP	0x00800000

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

+5 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include "dwmac_dma.h"



static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb,

			      int burst_len, u32 dma_tx, u32 dma_rx)

			      int mb, int burst_len, u32 dma_tx, u32 dma_rx)

{

	u32 value = readl(ioaddr + DMA_BUS_MODE);

	int limit;
@@ -66,6 +66,10 @@ static int dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb, 
	if (fb)

		value |= DMA_BUS_MODE_FB;



	/* Mixed Burst has no effect when fb is set */

	if (mb)

		value |= DMA_BUS_MODE_MB;



#ifdef CONFIG_STMMAC_DA

	value |= DMA_BUS_MODE_DA;	/* Rx has priority over tx */

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "dwmac_dma.h"



static int dwmac100_dma_init(void __iomem *ioaddr, int pbl, int fb,

			     int burst_len, u32 dma_tx, u32 dma_rx)

			     int mb, int burst_len, u32 dma_tx, u32 dma_rx)

{

	u32 value = readl(ioaddr + DMA_BUS_MODE);

	int limit;

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

+3 −1
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ static void stmmac_check_ether_addr(struct stmmac_priv *priv) 
static int stmmac_init_dma_engine(struct stmmac_priv *priv)

{

	int pbl = DEFAULT_DMA_PBL, fixed_burst = 0, burst_len = 0;

	int mixed_burst = 0;



	/* Some DMA parameters can be passed from the platform;

	 * in case of these are not passed we keep a default
@@ -932,10 +933,11 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) 
	if (priv->plat->dma_cfg) {

		pbl = priv->plat->dma_cfg->pbl;

		fixed_burst = priv->plat->dma_cfg->fixed_burst;

		mixed_burst = priv->plat->dma_cfg->mixed_burst;

		burst_len = priv->plat->dma_cfg->burst_len;

	}



	return priv->hw->dma->init(priv->ioaddr, pbl, fixed_burst,

	return priv->hw->dma->init(priv->ioaddr, pbl, fixed_burst, mixed_burst,

				   burst_len, priv->dma_tx_phy,

				   priv->dma_rx_phy);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE