| Message ID | 20210126115854.2530-3-qiangqing.zhang@nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ethernet: fixes for stmmac driver | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | warning | 3 maintainers not CCed: mcoquelin.stm32@gmail.com linux-stm32@st-md-mailman.stormreply.com linux-arm-kernel@lists.infradead.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 10 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On Tue, Jan 26, 2021 at 7:03 AM Joakim Zhang <qiangqing.zhang@nxp.com> wrote: > > If clear GMAC_CONFIG_TE bit, it would stop all tx channels, but users > may only want to stop secific tx channel. secific -> specific > > Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx") > Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > index 0b4ee2dbb691..71e50751ef2d 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > @@ -53,10 +53,6 @@ void dwmac4_dma_stop_tx(void __iomem *ioaddr, u32 chan) > > value &= ~DMA_CONTROL_ST; > writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan)); > - > - value = readl(ioaddr + GMAC_CONFIG); > - value &= ~GMAC_CONFIG_TE; > - writel(value, ioaddr + GMAC_CONFIG); Is it safe to partially unwind the actions of dwmac4_dma_start_tx And would the same reasoning apply to dwmac4_(dma_start|stop)_rx?
> -----Original Message----- > From: Willem de Bruijn <willemdebruijn.kernel@gmail.com> > Sent: 2021年1月27日 7:10 > To: Joakim Zhang <qiangqing.zhang@nxp.com> > Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>; Alexandre Torgue > <alexandre.torgue@st.com>; Jose Abreu <joabreu@synopsys.com>; David > Miller <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>; Network > Development <netdev@vger.kernel.org>; dl-linux-imx <linux-imx@nxp.com>; > Andrew Lunn <andrew@lunn.ch>; Florian Fainelli <f.fainelli@gmail.com> > Subject: Re: [PATCH V3 2/6] net: stmmac: stop each tx channel independently > > On Tue, Jan 26, 2021 at 7:03 AM Joakim Zhang <qiangqing.zhang@nxp.com> > wrote: > > > > If clear GMAC_CONFIG_TE bit, it would stop all tx channels, but users > > may only want to stop secific tx channel. > > secific -> specific Thanks. Will correct it. > > > > Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx") > > Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com> > > --- > > drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 ---- > > 1 file changed, 4 deletions(-) > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > > b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > > index 0b4ee2dbb691..71e50751ef2d 100644 > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > > @@ -53,10 +53,6 @@ void dwmac4_dma_stop_tx(void __iomem *ioaddr, > u32 > > chan) > > > > value &= ~DMA_CONTROL_ST; > > writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan)); > > - > > - value = readl(ioaddr + GMAC_CONFIG); > > - value &= ~GMAC_CONFIG_TE; > > - writel(value, ioaddr + GMAC_CONFIG); > > Is it safe to partially unwind the actions of dwmac4_dma_start_tx > > And would the same reasoning apply to dwmac4_(dma_start|stop)_rx? Sorry, I am not quite understand what you means. What this patch did is to align to dwmac4_(dma_start|stop)_rx. dwmac4_dma_start_rx: assert DMA_CONTROL_SR bit for each channel, and assert GMAC_CONFIG_RE bit which targets all channels. dwmac4_dma_stop_rx: only need clear DMA_CONTROL_SR bit for each channel. After this patch applied: dwmac4_dma_start_tx: assert DMA_CONTROL_ST bit for each channel, and assert GMAC_CONFIG_TE bit which targets all channels. dwmac4_dma_stop_tx: only need clear DMA_CONTROL_ST bit for each channel. You can refer to drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c, this is the correct sequence. Thanks. Best Regards, Joakim Zhang
On Tue, Jan 26, 2021 at 8:44 PM Joakim Zhang <qiangqing.zhang@nxp.com> wrote: > > > > -----Original Message----- > > From: Willem de Bruijn <willemdebruijn.kernel@gmail.com> > > Sent: 2021年1月27日 7:10 > > To: Joakim Zhang <qiangqing.zhang@nxp.com> > > Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>; Alexandre Torgue > > <alexandre.torgue@st.com>; Jose Abreu <joabreu@synopsys.com>; David > > Miller <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>; Network > > Development <netdev@vger.kernel.org>; dl-linux-imx <linux-imx@nxp.com>; > > Andrew Lunn <andrew@lunn.ch>; Florian Fainelli <f.fainelli@gmail.com> > > Subject: Re: [PATCH V3 2/6] net: stmmac: stop each tx channel independently > > > > On Tue, Jan 26, 2021 at 7:03 AM Joakim Zhang <qiangqing.zhang@nxp.com> > > wrote: > > > > > > If clear GMAC_CONFIG_TE bit, it would stop all tx channels, but users > > > may only want to stop secific tx channel. > > > > secific -> specific > > Thanks. Will correct it. > > > > > > > Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx") > > > Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com> > > > --- > > > drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 ---- > > > 1 file changed, 4 deletions(-) > > > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > > > b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > > > index 0b4ee2dbb691..71e50751ef2d 100644 > > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c > > > @@ -53,10 +53,6 @@ void dwmac4_dma_stop_tx(void __iomem *ioaddr, > > u32 > > > chan) > > > > > > value &= ~DMA_CONTROL_ST; > > > writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan)); > > > - > > > - value = readl(ioaddr + GMAC_CONFIG); > > > - value &= ~GMAC_CONFIG_TE; > > > - writel(value, ioaddr + GMAC_CONFIG); > > > > Is it safe to partially unwind the actions of dwmac4_dma_start_tx > > > > And would the same reasoning apply to dwmac4_(dma_start|stop)_rx? > > Sorry, I am not quite understand what you means. > > What this patch did is to align to dwmac4_(dma_start|stop)_rx. > > dwmac4_dma_start_rx: assert DMA_CONTROL_SR bit for each channel, and assert GMAC_CONFIG_RE bit which targets all channels. > dwmac4_dma_stop_rx: only need clear DMA_CONTROL_SR bit for each channel. > > After this patch applied: > dwmac4_dma_start_tx: assert DMA_CONTROL_ST bit for each channel, and assert GMAC_CONFIG_TE bit which targets all channels. > dwmac4_dma_stop_tx: only need clear DMA_CONTROL_ST bit for each channel. Oh indeed. Sorry, I should have seen that it exactly brings the tx logic into agreement with rx. Thanks.
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c index 0b4ee2dbb691..71e50751ef2d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c @@ -53,10 +53,6 @@ void dwmac4_dma_stop_tx(void __iomem *ioaddr, u32 chan) value &= ~DMA_CONTROL_ST; writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan)); - - value = readl(ioaddr + GMAC_CONFIG); - value &= ~GMAC_CONFIG_TE; - writel(value, ioaddr + GMAC_CONFIG); } void dwmac4_dma_start_rx(void __iomem *ioaddr, u32 chan)
If clear GMAC_CONFIG_TE bit, it would stop all tx channels, but users may only want to stop secific tx channel. Fixes: 48863ce5940f ("stmmac: add DMA support for GMAC 4.xx") Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com> --- drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 4 ---- 1 file changed, 4 deletions(-)