Commit 50ca903a authored by Niklas Cassel's avatar Niklas Cassel Committed by David S. Miller
Browse files

net: stmmac: simplify the common DMA init API 



Use struct stmmac_dma_cfg *dma_cfg as an argument rather
than using all the struct members as individual arguments.

Signed-off-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
Acked-by: default avatarAlexandre Torgue <alexandre.torgue@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89ab75bf

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

+2 −2
Original line number Diff line number Diff line
@@ -412,8 +412,8 @@ extern const struct stmmac_desc_ops ndesc_ops; 
struct stmmac_dma_ops {

	/* DMA core initialization */

	int (*reset)(void __iomem *ioaddr);

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

		     int aal, u32 dma_tx, u32 dma_rx, int atds);

	void (*init)(void __iomem *ioaddr, struct stmmac_dma_cfg *dma_cfg,

		     u32 dma_tx, u32 dma_rx, int atds);

	/* Configure the AXI Bus Mode Register */

	void (*axi)(void __iomem *ioaddr, struct stmmac_axi *axi);

	/* Dump DMA registers */

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

+7 −6
Original line number Diff line number Diff line
@@ -84,8 +84,9 @@ static void dwmac1000_dma_axi(void __iomem *ioaddr, struct stmmac_axi *axi) 
	writel(value, ioaddr + DMA_AXI_BUS_MODE);

}



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

			       int aal, u32 dma_tx, u32 dma_rx, int atds)

static void dwmac1000_dma_init(void __iomem *ioaddr,

			       struct stmmac_dma_cfg *dma_cfg,

			       u32 dma_tx, u32 dma_rx, int atds)

{

	u32 value = readl(ioaddr + DMA_BUS_MODE);
@@ -101,20 +102,20 @@ static void dwmac1000_dma_init(void __iomem *ioaddr, int pbl, int fb, int mb, 
	 */

	value |= DMA_BUS_MODE_MAXPBL;

	value &= ~DMA_BUS_MODE_PBL_MASK;

	value |= (pbl << DMA_BUS_MODE_PBL_SHIFT);

	value |= (dma_cfg->pbl << DMA_BUS_MODE_PBL_SHIFT);



	/* Set the Fixed burst mode */

	if (fb)

	if (dma_cfg->fixed_burst)

		value |= DMA_BUS_MODE_FB;



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

	if (mb)

	if (dma_cfg->mixed_burst)

		value |= DMA_BUS_MODE_MB;



	if (atds)

		value |= DMA_BUS_MODE_ATDS;



	if (aal)

	if (dma_cfg->aal)

		value |= DMA_BUS_MODE_AAL;



	writel(value, ioaddr + DMA_BUS_MODE);

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

+4 −3
Original line number Diff line number Diff line
@@ -32,11 +32,12 @@ 
#include "dwmac100.h"

#include "dwmac_dma.h"



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

			      int aal, u32 dma_tx, u32 dma_rx, int atds)

static void dwmac100_dma_init(void __iomem *ioaddr,

			      struct stmmac_dma_cfg *dma_cfg,

			      u32 dma_tx, u32 dma_rx, int atds)

{

	/* Enable Application Access by writing to DMA CSR0 */

	writel(DMA_BUS_MODE_DEFAULT | (pbl << DMA_BUS_MODE_PBL_SHIFT),

	writel(DMA_BUS_MODE_DEFAULT | (dma_cfg->pbl << DMA_BUS_MODE_PBL_SHIFT),

	       ioaddr + DMA_BUS_MODE);



	/* Mask interrupts by writing to CSR7 */

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

+8 −6
Original line number Diff line number Diff line
@@ -99,27 +99,29 @@ static void dwmac4_dma_init_channel(void __iomem *ioaddr, int pbl, 
	writel(dma_rx_phy, ioaddr + DMA_CHAN_RX_BASE_ADDR(channel));

}



static void dwmac4_dma_init(void __iomem *ioaddr, int pbl, int fb, int mb,

			    int aal, u32 dma_tx, u32 dma_rx, int atds)

static void dwmac4_dma_init(void __iomem *ioaddr,

			    struct stmmac_dma_cfg *dma_cfg,

			    u32 dma_tx, u32 dma_rx, int atds)

{

	u32 value = readl(ioaddr + DMA_SYS_BUS_MODE);

	int i;



	/* Set the Fixed burst mode */

	if (fb)

	if (dma_cfg->fixed_burst)

		value |= DMA_SYS_BUS_FB;



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

	if (mb)

	if (dma_cfg->mixed_burst)

		value |= DMA_SYS_BUS_MB;



	if (aal)

	if (dma_cfg->aal)

		value |= DMA_SYS_BUS_AAL;



	writel(value, ioaddr + DMA_SYS_BUS_MODE);



	for (i = 0; i < DMA_CHANNEL_NB_MAX; i++)

		dwmac4_dma_init_channel(ioaddr, pbl, dma_tx, dma_rx, i);

		dwmac4_dma_init_channel(ioaddr, dma_cfg->pbl,

					dma_tx, dma_rx, i);

}



static void _dwmac4_dump_dma_regs(void __iomem *ioaddr, u32 channel)

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

+1 −5
Original line number Diff line number Diff line
@@ -1595,11 +1595,7 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) 
		return ret;

	}



	priv->hw->dma->init(priv->ioaddr,

			    priv->plat->dma_cfg->pbl,

			    priv->plat->dma_cfg->fixed_burst,

			    priv->plat->dma_cfg->mixed_burst,

			    priv->plat->dma_cfg->aal,

	priv->hw->dma->init(priv->ioaddr, priv->plat->dma_cfg,

			    priv->dma_tx_phy, priv->dma_rx_phy, atds);



	if (priv->synopsys_id >= DWMAC_CORE_4_00) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE