releases/5.1.7/net-stmmac-dma-channel-control-register-need-to-be-init-first.patch

   1 From foo@baz Fri 31 May 2019 03:16:39 PM PDT
   2 From: Weifeng Voon <weifeng.voon@intel.com>
   3 Date: Tue, 21 May 2019 13:38:38 +0800
   4 Subject: net: stmmac: dma channel control register need to be init first
   5
   6 From: Weifeng Voon <weifeng.voon@intel.com>
   7
   8 stmmac_init_chan() needs to be called before stmmac_init_rx_chan() and
   9 stmmac_init_tx_chan(). This is because if PBLx8 is to be used,
  10 "DMA_CH(#i)_Control.PBLx8" needs to be set before programming
  11 "DMA_CH(#i)_TX_Control.TxPBL" and "DMA_CH(#i)_RX_Control.RxPBL".
  12
  13 Fixes: 47f2a9ce527a ("net: stmmac: dma channel init prepared for multiple queues")
  14 Reviewed-by: Zhang, Baoli <baoli.zhang@intel.com>
  15 Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
  16 Signed-off-by: Weifeng Voon <weifeng.voon@intel.com>
  17 Signed-off-by: David S. Miller <davem@davemloft.net>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19 ---
  20  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    8 ++++----
  21  1 file changed, 4 insertions(+), 4 deletions(-)
  22
  23 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  24 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  25 @@ -2208,6 +2208,10 @@ static int stmmac_init_dma_engine(struct
  26         if (priv->plat->axi)
  27                 stmmac_axi(priv, priv->ioaddr, priv->plat->axi);
  28
  29 +       /* DMA CSR Channel configuration */
  30 +       for (chan = 0; chan < dma_csr_ch; chan++)
  31 +               stmmac_init_chan(priv, priv->ioaddr, priv->plat->dma_cfg, chan);
  32 +
  33         /* DMA RX Channel Configuration */
  34         for (chan = 0; chan < rx_channels_count; chan++) {
  35                 rx_q = &priv->rx_queue[chan];
  36 @@ -2233,10 +2237,6 @@ static int stmmac_init_dma_engine(struct
  37                                        tx_q->tx_tail_addr, chan);
  38         }
  39
  40 -       /* DMA CSR Channel configuration */
  41 -       for (chan = 0; chan < dma_csr_ch; chan++)
  42 -               stmmac_init_chan(priv, priv->ioaddr, priv->plat->dma_cfg, chan);
  43 -
  44         return ret;
  45  }
  46