* [PATCH net 0/2] Fix PTP issue in stmmac
@ 2022-01-24 9:59 Mohammad Athari Bin Ismail
2022-01-24 9:59 ` [PATCH net 1/2] net: stmmac: configure PTP clock source prior to PTP initialization Mohammad Athari Bin Ismail
2022-01-24 9:59 ` [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend Mohammad Athari Bin Ismail
0 siblings, 2 replies; 9+ messages in thread
From: Mohammad Athari Bin Ismail @ 2022-01-24 9:59 UTC (permalink / raw)
To: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin,
Ong Boon Leong, Voon Weifeng, Wong Vee Khee, Huacai Chen
Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel,
mohammad.athari.ismail
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(-)
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net 1/2] net: stmmac: configure PTP clock source prior to PTP initialization
2022-01-24 9:59 [PATCH net 0/2] Fix PTP issue in stmmac Mohammad Athari Bin Ismail
@ 2022-01-24 9:59 ` Mohammad Athari Bin Ismail
2022-01-24 9:59 ` [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend Mohammad Athari Bin Ismail
1 sibling, 0 replies; 9+ messages in thread
From: Mohammad Athari Bin Ismail @ 2022-01-24 9:59 UTC (permalink / raw)
To: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin,
Ong Boon Leong, Voon Weifeng, Wong Vee Khee, Huacai Chen
Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel,
mohammad.athari.ismail
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().
Fixes: 76da35dc99af ("stmmac: intel: Add PSE and PCH PTP clock source selection")
Cc: <stable@vger.kernel.org> # 5.15.x
Signed-off-by: Mohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>
---
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(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 6708ca2aa4f7..d7e261768f73 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -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;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
index 0d24ebd37873..1c9f02f9c317 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -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;
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend
2022-01-24 9:59 [PATCH net 0/2] Fix PTP issue in stmmac Mohammad Athari Bin Ismail
2022-01-24 9:59 ` [PATCH net 1/2] net: stmmac: configure PTP clock source prior to PTP initialization Mohammad Athari Bin Ismail
@ 2022-01-24 9:59 ` Mohammad Athari Bin Ismail
2022-01-24 13:15 ` Andrew Lunn
1 sibling, 1 reply; 9+ messages in thread
From: Mohammad Athari Bin Ismail @ 2022-01-24 9:59 UTC (permalink / raw)
To: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin,
Ong Boon Leong, Voon Weifeng, Wong Vee Khee, Huacai Chen
Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel,
mohammad.athari.ismail
When 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.
Fixes: fe1319291150 ("stmmac: Don't init ptp again when resume from suspend/hibernation")
Cc: <stable@vger.kernel.org> # 5.15.x
Signed-off-by: Mohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>
---
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index d7e261768f73..cfea38a50a73 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -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;
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend
2022-01-24 9:59 ` [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend Mohammad Athari Bin Ismail
@ 2022-01-24 13:15 ` Andrew Lunn
2022-01-24 22:19 ` Ismail, Mohammad Athari
0 siblings, 1 reply; 9+ messages in thread
From: Andrew Lunn @ 2022-01-24 13:15 UTC (permalink / raw)
To: Mohammad Athari Bin Ismail
Cc: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin,
Ong Boon Leong, Voon Weifeng, Wong Vee Khee, Huacai Chen, netdev,
linux-stm32, linux-arm-kernel, linux-kernel
> @@ -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");
The init_ptp parameter now seems unused? If so, please remove it.
Andrew
^ permalink raw reply [flat|nested] 9+ messages in thread* RE: [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend
2022-01-24 13:15 ` Andrew Lunn
@ 2022-01-24 22:19 ` Ismail, Mohammad Athari
2022-01-25 1:32 ` Andrew Lunn
0 siblings, 1 reply; 9+ messages in thread
From: Ismail, Mohammad Athari @ 2022-01-24 22:19 UTC (permalink / raw)
To: Andrew Lunn
Cc: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin, Ong,
Boon Leong, Voon, Weifeng, Wong, Vee Khee, Huacai Chen, netdev,
linux-stm32, linux-arm-kernel, linux-kernel
> -----Original Message-----
> From: Andrew Lunn <andrew@lunn.ch>
> Sent: Monday, January 24, 2022 9:15 PM
> To: Ismail, Mohammad Athari <mohammad.athari.ismail@intel.com>
> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>; Alexandre Torgue
> <alexandre.torgue@st.com>; Jose Abreu <joabreu@synopsys.com>; David
> S . Miller <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>;
> Maxime Coquelin <mcoquelin.stm32@gmail.com>; Ong, Boon Leong
> <boon.leong.ong@intel.com>; Voon, Weifeng <weifeng.voon@intel.com>;
> Wong, Vee Khee <vee.khee.wong@intel.com>; Huacai Chen
> <chenhuacai@kernel.org>; netdev@vger.kernel.org; linux-stm32@st-md-
> mailman.stormreply.com; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org
> Subject: Re: [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register
> when resume from suspend
>
> > @@ -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");
>
> The init_ptp parameter 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-
>
> Andrew
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend
2022-01-24 22:19 ` Ismail, Mohammad Athari
@ 2022-01-25 1:32 ` Andrew Lunn
0 siblings, 0 replies; 9+ messages in thread
From: Andrew Lunn @ 2022-01-25 1:32 UTC (permalink / raw)
To: Ismail, Mohammad Athari
Cc: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin, Ong,
Boon Leong, Voon, Weifeng, Wong, Vee Khee, Huacai Chen, netdev,
linux-stm32, linux-arm-kernel, linux-kernel
> > > @@ -3308,13 +3309,11 @@ static int stmmac_hw_setup(struct net_device
> > *dev, bool init_ptp)
...
> > The init_ptp parameter 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net 0/2] Fix PTP issue in stmmac
@ 2022-01-25 3:23 Mohammad Athari Bin Ismail
0 siblings, 0 replies; 9+ messages in thread
From: Mohammad Athari Bin Ismail @ 2022-01-25 3:23 UTC (permalink / raw)
To: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin,
Ong Boon Leong, Voon Weifeng, Wong Vee Khee, Huacai Chen,
Alexandre Torgue
Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel, stable,
mohammad.athari.ismail
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 | 25 +++++++++++--------
.../net/ethernet/stmicro/stmmac/stmmac_ptp.c | 3 ---
2 files changed, 14 insertions(+), 14 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net 0/2] Fix PTP issue in stmmac
@ 2022-01-26 9:47 Mohammad Athari Bin Ismail
2022-01-27 14:00 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 9+ messages in thread
From: Mohammad Athari Bin Ismail @ 2022-01-26 9:47 UTC (permalink / raw)
To: Giuseppe Cavallaro, Alexandre Torgue, Jose Abreu,
David S . Miller, Jakub Kicinski, Maxime Coquelin,
Ong Boon Leong, Voon Weifeng, Wong Vee Khee, Huacai Chen,
Alexandre Torgue
Cc: netdev, linux-stm32, linux-arm-kernel, linux-kernel, stable,
mohammad.athari.ismail
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(-)
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net 0/2] Fix PTP issue in stmmac
2022-01-26 9:47 Mohammad Athari Bin Ismail
@ 2022-01-27 14:00 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 9+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-01-27 14:00 UTC (permalink / raw)
To: Mohammad Athari Bin Ismail
Cc: peppe.cavallaro, alexandre.torgue, joabreu, davem, kuba,
mcoquelin.stm32, boon.leong.ong, weifeng.voon, vee.khee.wong,
chenhuacai, alexandre.torgue, netdev, linux-stm32,
linux-arm-kernel, linux-kernel, stable
Hello:
This series was applied to netdev/net.git (master)
by David S. Miller <davem@davemloft.net>:
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 only stmmac_ptp_register when 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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-01-27 14:00 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-24 9:59 [PATCH net 0/2] Fix PTP issue in stmmac Mohammad Athari Bin Ismail
2022-01-24 9:59 ` [PATCH net 1/2] net: stmmac: configure PTP clock source prior to PTP initialization Mohammad Athari Bin Ismail
2022-01-24 9:59 ` [PATCH net 2/2] net: stmmac: skip only stmmac_ptp_register when resume from suspend Mohammad Athari Bin Ismail
2022-01-24 13:15 ` Andrew Lunn
2022-01-24 22:19 ` Ismail, Mohammad Athari
2022-01-25 1:32 ` Andrew Lunn
2022-01-25 3:23 [PATCH net 0/2] Fix PTP issue in stmmac Mohammad Athari Bin Ismail
2022-01-26 9:47 Mohammad Athari Bin Ismail
2022-01-27 14:00 ` patchwork-bot+netdevbpf
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).