netdev - RE: [PATCH net 1/1] net: stmmac: fix incorrect DMA channel intr enable setting of EQoS v4.10

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Wed, 3 Mar 2021 06:16:14 +0000
From:   Joakim Zhang <qiangqing.zhang@....com>
To:     "ramesh.babu.b@...el.com" <ramesh.babu.b@...el.com>,
        Giuseppe Cavallaro <peppe.cavallaro@...com>,
        Alexandre Torgue <alexandre.torgue@...com>,
        Jose Abreu <joabreu@...opsys.com>,
        "David S . Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Maxime Coquelin <mcoquelin.stm32@...il.com>
CC:     "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        "linux-stm32@...md-mailman.stormreply.com" 
        <linux-stm32@...md-mailman.stormreply.com>,
        "linux-arm-kernel@...ts.infradead.org" 
        <linux-arm-kernel@...ts.infradead.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Ong Boon Leong <boon.leong.ong@...el.com>,
        Voon Wei Feng <weifeng.voon@...el.com>,
        Wong Vee Khee <vee.khee.wong@...el.com>
Subject: RE: [PATCH net 1/1] net: stmmac: fix incorrect DMA channel intr
 enable setting of EQoS v4.10


> -----Original Message-----
> From: ramesh.babu.b@...el.com <ramesh.babu.b@...el.com>
> Sent: 2021年3月3日 23:09
> To: Giuseppe Cavallaro <peppe.cavallaro@...com>; Alexandre Torgue
> <alexandre.torgue@...com>; Jose Abreu <joabreu@...opsys.com>; David S .
> Miller <davem@...emloft.net>; Jakub Kicinski <kuba@...nel.org>; Maxime
> Coquelin <mcoquelin.stm32@...il.com>
> Cc: netdev@...r.kernel.org; linux-stm32@...md-mailman.stormreply.com;
> linux-arm-kernel@...ts.infradead.org; linux-kernel@...r.kernel.org; Ong Boon
> Leong <boon.leong.ong@...el.com>; Voon Wei Feng
> <weifeng.voon@...el.com>; Wong Vee Khee <vee.khee.wong@...el.com>;
> Ramesh Babu B <ramesh.babu.b@...el.com>
> Subject: [PATCH net 1/1] net: stmmac: fix incorrect DMA channel intr enable
> setting of EQoS v4.10
> 
> From: Ong Boon Leong <boon.leong.ong@...el.com>
> 
> We introduce dwmac410_dma_init_channel() here for both EQoS v4.10 and
> above which use different DMA_CH(n)_Interrupt_Enable bit definitions for NIE
> and AIE.
> 
> Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx")
> Signed-off-by: Ong Boon Leong <boon.leong.ong@...el.com>
> Signed-off-by: Ramesh Babu B <ramesh.babu.b@...el.com>

Reviewed-by: Joakim Zhang <qiangqing.zhang@....com>

Best Regards,
Joakim Zhang
> ---
>  .../net/ethernet/stmicro/stmmac/dwmac4_dma.c  | 19
> ++++++++++++++++++-
>  1 file changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
> b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
> index bb29bfcd62c3..62aa0e95beb7 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c
> @@ -124,6 +124,23 @@ static void dwmac4_dma_init_channel(void __iomem
> *ioaddr,
>  	       ioaddr + DMA_CHAN_INTR_ENA(chan));  }
> 
> +static void dwmac410_dma_init_channel(void __iomem *ioaddr,
> +				      struct stmmac_dma_cfg *dma_cfg, u32 chan) {
> +	u32 value;
> +
> +	/* common channel control register config */
> +	value = readl(ioaddr + DMA_CHAN_CONTROL(chan));
> +	if (dma_cfg->pblx8)
> +		value = value | DMA_BUS_MODE_PBL;
> +
> +	writel(value, ioaddr + DMA_CHAN_CONTROL(chan));
> +
> +	/* Mask interrupts by writing to CSR7 */
> +	writel(DMA_CHAN_INTR_DEFAULT_MASK_4_10,
> +	       ioaddr + DMA_CHAN_INTR_ENA(chan)); }
> +
>  static void dwmac4_dma_init(void __iomem *ioaddr,
>  			    struct stmmac_dma_cfg *dma_cfg, int atds)  { @@
> -523,7 +540,7 @@ const struct stmmac_dma_ops dwmac4_dma_ops =
> {  const struct stmmac_dma_ops dwmac410_dma_ops = {
>  	.reset = dwmac4_dma_reset,
>  	.init = dwmac4_dma_init,
> -	.init_chan = dwmac4_dma_init_channel,
> +	.init_chan = dwmac410_dma_init_channel,
>  	.init_rx_chan = dwmac4_dma_init_rx_chan,
>  	.init_tx_chan = dwmac4_dma_init_tx_chan,
>  	.axi = dwmac4_dma_axi,
> --
> 2.17.1