Fix PTP issue in stmmac
Subsystems (4)
cover Fix PTP issue in stmmac
This patch series to fix PTP issue in stmmac related to:
1/ PTP clock source configuration during initialization. 2/ PTP initialization during resume from suspend.
Mohammad Athari Bin Ismail (2):
net: stmmac: configure PTP clock source prior to PTP initialization
net: stmmac: skip only stmmac_ptp_register when resume from suspend
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 22 ++++++++++--------- .../net/ethernet/stmicro/stmmac/stmmac_ptp.c | 3 --- 2 files changed, 12 insertions(+), 13 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 net: stmmac: configure PTP clock source prior to PTP initialization
For Intel platform, it is required to configure PTP clock source prior PTP initialization in MAC. So, need to move ptp_clk_freq_config execution from stmmac_ptp_register() to stmmac_init_ptp().
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +++ drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -0
@@ -889,6 +889,9 @@ static int stmmac_init_ptp(struct stmmac_priv *priv)bool xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac;int ret; +if (priv->plat->ptp_clk_freq_config) + priv->plat->ptp_clk_freq_config (priv); + ret =stmmac_init_tstamp_counter (priv,STMMAC_HWTS_ACTIVE );if (ret)return ret;
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +0 -3
@@ -297,9 +297,6 @@ void stmmac_ptp_register(struct stmmac_priv *priv) {int i; -if (priv->plat->ptp_clk_freq_config) - priv->plat->ptp_clk_freq_config (priv); -for (i =0 ; i < priv->dma_cap.pps_out_num; i++) {if (i >=STMMAC_PPS_MAX )break ;
Signature · 1 line
2.17.1
PATCH 2/2 net: stmmac: skip only stmmac_ptp_register when resume from suspend
In reply to Mohammad Athari Bin IsmailWhen resume from suspend, besides skipping PTP registration, it also skipping PTP HW initialization. This could cause PTP clock not able to operate properly when resume from suspend.
To fix this, only stmmac_ptp_register() is skipped when resume from suspend.
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +9 -10
@@ -884,7 +884,7 @@ EXPORT_SYMBOL_GPL(stmmac_init_tstamp_counter);* This is done by looking at the HW cap. register. * This function also registers the ptp driver. */ -static int stmmac_init_ptp (struct stmmac_priv *priv) +static int stmmac_init_ptp (struct stmmac_priv *priv,bool ptp_register) {bool xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac;int ret;
@@ -914,7 +914,8 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) priv->hwts_tx_en =0 ; priv->hwts_rx_en =0 ; -stmmac_ptp_register (priv); +if (ptp_register) +stmmac_ptp_register (priv);return 0 ; }
@@ -3251,7 +3252,7 @@ static int stmmac_fpe_start_wq(struct stmmac_priv *priv)* 0 on success and an appropriate (-)ve integer as defined in errno.h * file on failure. */ -static int stmmac_hw_setup (struct net_device *dev,bool init_ptp) +static int stmmac_hw_setup (struct net_device *dev,bool ptp_register) {struct stmmac_priv *priv =netdev_priv (dev);u32 rx_cnt = priv->plat->rx_queues_to_use;
@@ -3308,13 +3309,11 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)stmmac_mmc_setup (priv); -if (init_ptp) { - ret =stmmac_init_ptp (priv); -if (ret == -EOPNOTSUPP ) -netdev_warn (priv->dev,"PTP not supported by HW\n" ); -else if (ret) -netdev_warn (priv->dev,"PTP init failed\n" ); - } + ret =stmmac_init_ptp (priv, ptp_register); +if (ret == -EOPNOTSUPP ) +netdev_warn (priv->dev,"PTP not supported by HW\n" ); +else if (ret) +netdev_warn (priv->dev,"PTP init failed\n" ); priv->eee_tw_timer =STMMAC_DEFAULT_TWT_LS ;
Signature · 1 line
2.17.1
Re: [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend
Quoted 6 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0
-2@@ -3308,13 +3309,11 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)stmmac_mmc_setup (priv); -if (init_ptp) { - ret =stmmac_init_ptp (priv);
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) · line 3316
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +5
-5-if (ret == -EOPNOTSUPP ) -netdev_warn (priv->dev,"PTP not supported by HW\n" ); -else if (ret) -netdev_warn (priv->dev,"PTP init failed\n" ); - } + ret =stmmac_init_ptp (priv, ptp_register); +if (ret == -EOPNOTSUPP ) +netdev_warn (priv->dev,"PTP not supported by HW\n" ); +else if (ret) +netdev_warn (priv->dev,"PTP init failed\n" );
The init_ptp parameter now seems unused? If so, please remove it.
Andrew
RE: [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend
Quoted 28 lines
-----Original Message-----
From: Andrew Lunn <[email protected]>
Sent: Monday, January 24, 2022 9:15 PM
To: Ismail, Mohammad Athari <[email protected]>
Cc: Giuseppe Cavallaro <[email protected]>; Alexandre Torgue <[email protected]>; Jose Abreu <[email protected]>; David S . Miller <[email protected]>; Jakub Kicinski <[email protected]>; Maxime Coquelin <[email protected]>; Ong, Boon Leong <[email protected]>; Voon, Weifeng <[email protected]>; Wong, Vee Khee <[email protected]>; Huacai Chen <[email protected]>; [email protected]; linux-stm32@st-md- mailman.stormreply.com; [email protected]; linux- [email protected]
Subject: Re: [PATCH net 2/2] net: stmmac: skip onlystmmac_ptp_registerwhen resume from suspendReview static int stmmac_hw_setup(struct net_device
Quoted 1 line
(quoted diff) +0
-0@@ -3308,13 +3309,11 @@ static int stmmac_hw_setup(struct net_device*dev, bool
init_ptp)drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
Quoted 7 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0
-4stmmac_mmc_setup (priv); -if (init_ptp) { - ret =stmmac_init_ptp (priv); -if (ret == -EOPNOTSUPP ) - netdev_warn(priv->dev, "PTP not supported byHW\n");
Quoted 10 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) · line 3316
Quoted 8 lines
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +5
-3-else if (ret) -netdev_warn (priv->dev,"PTP init failed\n" ); - } + ret =stmmac_init_ptp (priv, ptp_register); +if (ret == -EOPNOTSUPP ) +netdev_warn (priv->dev,"PTP not supported by HW\n" ); +else if (ret) +netdev_warn (priv->dev,"PTP init failed\n" );The
init_ptpparameter now seems unused? If so, please remove it.
I believe you miss below diff. It is renamed to ptp_register.
-static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) +static int stmmac_hw_setup(struct net_device *dev, bool ptp_register)
{
struct stmmac_priv *priv = netdev_priv(dev);
There are build warnings as below. I'll fix it in v2.
../drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:888: warning: Function parameter or member 'ptp_register' not described in 'stmmac_init_ptp' ../drivers/net/ethernet/stmicro/stmmac/stmmac_main.c:3256: warning: Excess function parameter 'init_ptp' description in 'stmmac_hw_setup
Thanks
-Athari-
Quoted 2 lines
Andrew
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend
Quoted 2 lines
Quoted 2 lines
Review static int stmmac_hw_setup(struct net_device
Quoted 1 line
(quoted diff) +0
-0@@ -3308,13 +3309,11 @@ static int stmmac_hw_setup(struct net_device*dev, bool
init_ptp)
...
Quoted 3 lines
Quoted 1 line
The
init_ptpparameter now seems unused? If so, please remove it.I believe you miss below diff. It is renamed to
ptp_register.
Ah, yes, sorry. I was looking at the context information diff gives you, which still has the old name.
Andrew
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel