net: stmmac: dma channel control register need to be init first
Subsystems (4)
PATCH 1/1 net: stmmac: dma channel control register need to be init first
stmmac_init_chan() needs to be called before stmmac_init_rx_chan() and stmmac_init_tx_chan(). This is because if PBLx8 is to be used, "DMA_CH(#i)_Control.PBLx8" needs to be set before programming "DMA_CH(#i)_TX_Control.TxPBL" and "DMA_CH(#i)_RX_Control.RxPBL".
Fixes 47f2a9ce527a ("net: stmmac: dma channel init prepared for multiple queues")
Reviewed-by Zhang, Baoli <[email protected]>
Signed-off-by Ong Boon Leong <[email protected]>
Signed-off-by Weifeng Voon <[email protected]>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4 -4
@@ -2208,6 +2208,10 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)if (priv->plat->axi)stmmac_axi (priv, priv->ioaddr, priv->plat->axi); +/* DMA CSR Channel configuration */ +for (chan =0 ; chan < dma_csr_ch; chan++) +stmmac_init_chan (priv, priv->ioaddr, priv->plat->dma_cfg, chan); +/* DMA RX Channel Configuration */ for (chan =0 ; chan < rx_channels_count; chan++) { rx_q = &priv->rx_queue[chan];
@@ -2233,10 +2237,6 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv) tx_q->tx_tail_addr, chan); } -/* DMA CSR Channel configuration */ -for (chan =0 ; chan < dma_csr_ch; chan++) -stmmac_init_chan (priv, priv->ioaddr, priv->plat->dma_cfg, chan); -return ret; }
Signature · 1 line
1.9.1
David Miller
maintainerFrom: Weifeng Voon <[email protected]>
Date: Tue, 21 May 2019 13:38:38 +0800
Quoted 9 lines
stmmac_init_chan()needs to be called beforestmmac_init_rx_chan()andstmmac_init_tx_chan(). This is because if PBLx8 is to be used, "DMA_CH(#i)_Control.PBLx8" needs to be set before programming "DMA_CH(#i)_TX_Control.TxPBL" and "DMA_CH(#i)_RX_Control.RxPBL".Fixes 47f2a9ce527a ("net: stmmac: dma channel init prepared for multiple queues")Reviewed-by Zhang, Baoli <[email protected]>Signed-off-by Ong Boon Leong <[email protected]>Signed-off-by Weifeng Voon <[email protected]>
Applied and queued up for -stable.
Thanks.