LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [v2, PATCH 0/4] fix some bugs in stmmac
@ 2019-05-14  2:28 Biao Huang
  2019-05-14  2:28 ` [v2, PATCH 1/4] net: stmmac: update rx tail pointer register to fix rx dma hang issue Biao Huang
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Biao Huang @ 2019-05-14  2:28 UTC (permalink / raw)
  To: Jose Abreu, davem
  Cc: Giuseppe Cavallaro, Alexandre Torgue, Maxime Coquelin,
	Matthias Brugger, netdev, linux-stm32, linux-arm-kernel,
	linux-kernel, linux-mediatek, yt.shen, biao.huang, jianguo.zhang

changes in v2:                                                                  
        1. update rx_tail_addr as Jose's comment                                
        2. changes clk_csr condition as Alex's proposition                      
        3. remove init lines in dwmac-mediatek, get clk_csr from dts instead.   
                                                                                
v1:                                                                             
This series fix some bugs in stmmac driver                                      
3 patches are for common stmmac or dwmac4:                                      
        1. update rx tail pointer to fix rx dma hang issue.                     
        2. change condition for mdc clock to fix csr_clk can't be zero issue.   
        3. write the modified value back to MTL_OPERATION_MODE.                 
1 patch is for dwmac-mediatek:                                                  
        modify csr_clk value to fix mdio read/write fail issue for dwmac-mediatek
                                                                                
Biao Huang (4):                                                                 
  net: stmmac: update rx tail pointer register to fix rx dma hang               
    issue.                                                                      
  net: stmmac: fix csr_clk can't be zero issue                                  
  net: stmmac: write the modified value back to MTL_OPERATION_MODE              
  net: stmmac: dwmac-mediatek: modify csr_clk value to fix mdio                 
    read/write fail                                                             
                                                                                
 .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c   |    2 --                   
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c  |    2 ++                   
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |    7 ++++---              
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    5 ++++-                
 4 files changed, 10 insertions(+), 6 deletions(-)                              
                                                                                
--                                                                              
1.7.9.5 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [v2, PATCH 1/4] net: stmmac: update rx tail pointer register to fix rx dma hang issue.
  2019-05-14  2:28 [v2, PATCH 0/4] fix some bugs in stmmac Biao Huang
@ 2019-05-14  2:28 ` Biao Huang
  2019-05-14  2:28 ` [v2, PATCH 2/4] net: stmmac: fix csr_clk can't be zero issue Biao Huang
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Biao Huang @ 2019-05-14  2:28 UTC (permalink / raw)
  To: Jose Abreu, davem
  Cc: Giuseppe Cavallaro, Alexandre Torgue, Maxime Coquelin,
	Matthias Brugger, netdev, linux-stm32, linux-arm-kernel,
	linux-kernel, linux-mediatek, yt.shen, biao.huang, jianguo.zhang

Currently we will not update the receive descriptor tail pointer in
stmmac_rx_refill. Rx dma will think no available descriptors and stop
once received packets exceed DMA_RX_SIZE, so that the rx only test will fail.

Update the receive tail pointer in stmmac_rx_refill to add more descriptors
to the rx channel, so packets can be received continually

Signed-off-by: Biao Huang <biao.huang@mediatek.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 97c5e1a..906f2be 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3336,6 +3336,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
 		entry = STMMAC_GET_ENTRY(entry, DMA_RX_SIZE);
 	}
 	rx_q->dirty_rx = entry;
+	stmmac_set_rx_tail_ptr(priv, priv->ioaddr, rx_q->rx_tail_addr, queue);
 }
 
 /**
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [v2, PATCH 2/4] net: stmmac: fix csr_clk can't be zero issue
  2019-05-14  2:28 [v2, PATCH 0/4] fix some bugs in stmmac Biao Huang
  2019-05-14  2:28 ` [v2, PATCH 1/4] net: stmmac: update rx tail pointer register to fix rx dma hang issue Biao Huang
@ 2019-05-14  2:28 ` Biao Huang
  2019-05-14  2:28 ` [v2, PATCH 3/4] net: stmmac: write the modified value back to MTL_OPERATION_MODE Biao Huang
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Biao Huang @ 2019-05-14  2:28 UTC (permalink / raw)
  To: Jose Abreu, davem
  Cc: Giuseppe Cavallaro, Alexandre Torgue, Maxime Coquelin,
	Matthias Brugger, netdev, linux-stm32, linux-arm-kernel,
	linux-kernel, linux-mediatek, yt.shen, biao.huang, jianguo.zhang

The specific clk_csr value can be zero, and
stmmac_clk is necessary for MDC clock which can be set dynamically.
So, change the condition from plat->clk_csr to plat->stmmac_clk to
fix clk_csr can't be zero issue.

Signed-off-by: Biao Huang <biao.huang@mediatek.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |    6 +++---
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 906f2be..a905b63 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4374,10 +4374,10 @@ int stmmac_dvr_probe(struct device *device,
 	 * set the MDC clock dynamically according to the csr actual
 	 * clock input.
 	 */
-	if (!priv->plat->clk_csr)
-		stmmac_clk_csr_set(priv);
-	else
+	if (priv->plat->clk_csr >= 0)
 		priv->clk_csr = priv->plat->clk_csr;
+	else
+		stmmac_clk_csr_set(priv);
 
 	stmmac_check_pcs_mode(priv);
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 3031f2b..f45bfbe 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -408,7 +408,10 @@ struct plat_stmmacenet_data *
 	/* Default to phy auto-detection */
 	plat->phy_addr = -1;
 
-	/* Get clk_csr from device tree */
+	/* Default to get clk_csr from stmmac_clk_crs_set(),
+	 * or get clk_csr from device tree.
+	 */
+	plat->clk_csr = -1;
 	of_property_read_u32(np, "clk_csr", &plat->clk_csr);
 
 	/* "snps,phy-addr" is not a standard property. Mark it as deprecated
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [v2, PATCH 3/4] net: stmmac: write the modified value back to MTL_OPERATION_MODE
  2019-05-14  2:28 [v2, PATCH 0/4] fix some bugs in stmmac Biao Huang
  2019-05-14  2:28 ` [v2, PATCH 1/4] net: stmmac: update rx tail pointer register to fix rx dma hang issue Biao Huang
  2019-05-14  2:28 ` [v2, PATCH 2/4] net: stmmac: fix csr_clk can't be zero issue Biao Huang
@ 2019-05-14  2:28 ` Biao Huang
  2019-05-14  2:28 ` [v2, PATCH 4/4] net: stmmac: dwmac-mediatek: modify csr_clk value to fix mdio read/write fail Biao Huang
  2019-05-14  3:00 ` [v2, PATCH 0/4] fix some bugs in stmmac Andrew Lunn
  4 siblings, 0 replies; 7+ messages in thread
From: Biao Huang @ 2019-05-14  2:28 UTC (permalink / raw)
  To: Jose Abreu, davem
  Cc: Giuseppe Cavallaro, Alexandre Torgue, Maxime Coquelin,
	Matthias Brugger, netdev, linux-stm32, linux-arm-kernel,
	linux-kernel, linux-mediatek, yt.shen, biao.huang, jianguo.zhang

The value of MTL_OPERATION_MODE is modified, and should
be write back to the register.

Signed-off-by: Biao Huang <biao.huang@mediatek.com>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 7e5d5db..b4bb562 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -192,6 +192,8 @@ static void dwmac4_prog_mtl_tx_algorithms(struct mac_device_info *hw,
 	default:
 		break;
 	}
+
+	writel(value, ioaddr + MTL_OPERATION_MODE);
 }
 
 static void dwmac4_set_mtl_tx_queue_weight(struct mac_device_info *hw,
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [v2, PATCH 4/4] net: stmmac: dwmac-mediatek: modify csr_clk value to fix mdio read/write fail
  2019-05-14  2:28 [v2, PATCH 0/4] fix some bugs in stmmac Biao Huang
                   ` (2 preceding siblings ...)
  2019-05-14  2:28 ` [v2, PATCH 3/4] net: stmmac: write the modified value back to MTL_OPERATION_MODE Biao Huang
@ 2019-05-14  2:28 ` Biao Huang
  2019-05-14  3:00 ` [v2, PATCH 0/4] fix some bugs in stmmac Andrew Lunn
  4 siblings, 0 replies; 7+ messages in thread
From: Biao Huang @ 2019-05-14  2:28 UTC (permalink / raw)
  To: Jose Abreu, davem
  Cc: Giuseppe Cavallaro, Alexandre Torgue, Maxime Coquelin,
	Matthias Brugger, netdev, linux-stm32, linux-arm-kernel,
	linux-kernel, linux-mediatek, yt.shen, biao.huang, jianguo.zhang

1. the frequency of csr clock is 66.5MHz, so the csr_clk value should
be 0 other than 5.
2. the csr_clk can be got from device tree, so remove initialization here.

Change-Id: I3cd92fe380150fec6daa2d3acaab69a6d58344c0
Signed-off-by: Biao Huang <biao.huang@mediatek.com>
---
 .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c   |    2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
index bf25629..126b66b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
@@ -346,8 +346,6 @@ static int mediatek_dwmac_probe(struct platform_device *pdev)
 		return PTR_ERR(plat_dat);
 
 	plat_dat->interface = priv_plat->phy_mode;
-	/* clk_csr_i = 250-300MHz & MDC = clk_csr_i/124 */
-	plat_dat->clk_csr = 5;
 	plat_dat->has_gmac4 = 1;
 	plat_dat->has_gmac = 0;
 	plat_dat->pmt = 0;
-- 
1.7.9.5


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [v2, PATCH 0/4] fix some bugs in stmmac
  2019-05-14  2:28 [v2, PATCH 0/4] fix some bugs in stmmac Biao Huang
                   ` (3 preceding siblings ...)
  2019-05-14  2:28 ` [v2, PATCH 4/4] net: stmmac: dwmac-mediatek: modify csr_clk value to fix mdio read/write fail Biao Huang
@ 2019-05-14  3:00 ` Andrew Lunn
  2019-05-14  3:38   ` biao huang
  4 siblings, 1 reply; 7+ messages in thread
From: Andrew Lunn @ 2019-05-14  3:00 UTC (permalink / raw)
  To: Biao Huang
  Cc: Jose Abreu, davem, jianguo.zhang, Alexandre Torgue, netdev,
	linux-kernel, yt.shen, linux-mediatek, Maxime Coquelin,
	Matthias Brugger, Giuseppe Cavallaro, linux-stm32,
	linux-arm-kernel

On Tue, May 14, 2019 at 10:28:49AM +0800, Biao Huang wrote:
> changes in v2:                                                                  
>         1. update rx_tail_addr as Jose's comment                                
>         2. changes clk_csr condition as Alex's proposition                      
>         3. remove init lines in dwmac-mediatek, get clk_csr from dts instead.   

Hi Biao

Since these are fixes, could you provide a Fixes: tag for each one?

Thanks
	Andrew

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [v2, PATCH 0/4] fix some bugs in stmmac
  2019-05-14  3:00 ` [v2, PATCH 0/4] fix some bugs in stmmac Andrew Lunn
@ 2019-05-14  3:38   ` biao huang
  0 siblings, 0 replies; 7+ messages in thread
From: biao huang @ 2019-05-14  3:38 UTC (permalink / raw)
  To: Andrew Lunn
  Cc: Jose Abreu, davem, jianguo.zhang, Alexandre Torgue, netdev,
	linux-kernel, yt.shen, linux-mediatek, Maxime Coquelin,
	Matthias Brugger, Giuseppe Cavallaro, linux-stm32,
	linux-arm-kernel

Hi Andrew,
	Add a Fixes:tag in series v3, please review.

On Tue, 2019-05-14 at 05:00 +0200, Andrew Lunn wrote:
> On Tue, May 14, 2019 at 10:28:49AM +0800, Biao Huang wrote:
> > changes in v2:                                                                  
> >         1. update rx_tail_addr as Jose's comment                                
> >         2. changes clk_csr condition as Alex's proposition                      
> >         3. remove init lines in dwmac-mediatek, get clk_csr from dts instead.   
> 
> Hi Biao
> 
> Since these are fixes, could you provide a Fixes: tag for each one?
> 
> Thanks
> 	Andrew



^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-05-14  3:39 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-14  2:28 [v2, PATCH 0/4] fix some bugs in stmmac Biao Huang
2019-05-14  2:28 ` [v2, PATCH 1/4] net: stmmac: update rx tail pointer register to fix rx dma hang issue Biao Huang
2019-05-14  2:28 ` [v2, PATCH 2/4] net: stmmac: fix csr_clk can't be zero issue Biao Huang
2019-05-14  2:28 ` [v2, PATCH 3/4] net: stmmac: write the modified value back to MTL_OPERATION_MODE Biao Huang
2019-05-14  2:28 ` [v2, PATCH 4/4] net: stmmac: dwmac-mediatek: modify csr_clk value to fix mdio read/write fail Biao Huang
2019-05-14  3:00 ` [v2, PATCH 0/4] fix some bugs in stmmac Andrew Lunn
2019-05-14  3:38   ` biao huang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).