Fix PTP issue in stmmac
Subsystems (5)
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 | 23 ++++++++++--------- .../net/ethernet/stmicro/stmmac/stmmac_ptp.c | 3 --- 2 files changed, 12 insertions(+), 14 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 v3 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.
---
v3 changelog:
- Move the stmmac_ptp_register() call out to stmmac_hw_setup(). Commented by Jakub Kicinski <[email protected]>.
v2 changelog:
- Fix build warning related to "function parameter or member not described".
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +9 -11
@@ -914,8 +914,6 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) priv->hwts_tx_en =0 ; priv->hwts_rx_en =0 ; -stmmac_ptp_register (priv); -return 0 ; }
@@ -3241,7 +3239,7 @@ static int stmmac_fpe_start_wq(struct stmmac_priv *priv)/** * stmmac_hw_setup - setup mac in a usable state. * @dev : pointer to the device structure. -* @init_ptp: initialize PTP if set +* @ptp_register: register PTP if set * Description: * this is the main function to setup the HW in a usable state because the * dma engine is reset, the core registers are configured (e.g. AXI,
@@ -3251,7 +3249,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 +3306,13 @@ 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); +if (ret == -EOPNOTSUPP ) +netdev_warn (priv->dev,"PTP not supported by HW\n" ); +else if (ret) +netdev_warn (priv->dev,"PTP init failed\n" ); +else if (ptp_register) +stmmac_ptp_register (priv); priv->eee_tw_timer =STMMAC_DEFAULT_TWT_LS ;
Signature · 1 line
2.17.1
This series was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by David S. Miller <[email protected]>:
Quoted 9 lines · On Wed, 26 Jan 2022 17:47:21 +0800 you wrote:
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 onlystmmac_ptp_registerwhen resume from suspend[...]
Here is the summary with links:
- [net,1/2] net: stmmac: configure PTP clock source prior to PTP initialization
https://git.kernel.org/netdev/net/c/94c82de43e01 - [net,v3,2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend https://git.kernel.org/netdev/net/c/0735e639f129
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html