* [PATCH] Fix PTP driver warnings by removing settime64 check
@ 2025-12-29 17:32 Tinsae Tadesse
2025-12-29 19:13 ` Vadim Fedorenko
2025-12-30 9:42 ` Paolo Abeni
0 siblings, 2 replies; 6+ messages in thread
From: Tinsae Tadesse @ 2025-12-29 17:32 UTC (permalink / raw)
To: richardcochran, andrew+netdev, davem, edumazet, kuba, pabeni
Cc: Tinsae Tadesse, netdev, linux-kernel
Signed-off-by: Tinsae Tadesse <tinsaetadesse2015@gmail.com>
---
drivers/ptp/ptp_clock.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index b0e167c0b3eb..5374b3e9ad15 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -323,8 +323,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
size_t size;
if (WARN_ON_ONCE(info->n_alarm > PTP_MAX_ALARMS ||
- (!info->gettimex64 && !info->gettime64) ||
- !info->settime64))
+ (!info->gettimex64 && !info->gettime64)))
return ERR_PTR(-EINVAL);
/* Initialize a clock structure. */
--
2.47.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix PTP driver warnings by removing settime64 check
2025-12-29 17:32 [PATCH] Fix PTP driver warnings by removing settime64 check Tinsae Tadesse
@ 2025-12-29 19:13 ` Vadim Fedorenko
[not found] ` <CAJ12PfM3zkJCJLJ3dLtvab2t9O9Dqs8MnoEo=zDb5OcyAPDuJQ@mail.gmail.com>
2025-12-30 9:42 ` Paolo Abeni
1 sibling, 1 reply; 6+ messages in thread
From: Vadim Fedorenko @ 2025-12-29 19:13 UTC (permalink / raw)
To: Tinsae Tadesse, richardcochran, andrew+netdev, davem, edumazet,
kuba, pabeni
Cc: netdev, linux-kernel
On 29/12/2025 17:32, Tinsae Tadesse wrote:
> Signed-off-by: Tinsae Tadesse <tinsaetadesse2015@gmail.com>
> ---
> drivers/ptp/ptp_clock.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
> index b0e167c0b3eb..5374b3e9ad15 100644
> --- a/drivers/ptp/ptp_clock.c
> +++ b/drivers/ptp/ptp_clock.c
> @@ -323,8 +323,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
> size_t size;
>
> if (WARN_ON_ONCE(info->n_alarm > PTP_MAX_ALARMS ||
> - (!info->gettimex64 && !info->gettime64) ||
> - !info->settime64))
> + (!info->gettimex64 && !info->gettime64)))
> return ERR_PTR(-EINVAL);
>
> /* Initialize a clock structure. */
Could you please tell us a bit more about reasoning for this patch?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix PTP driver warnings by removing settime64 check
2025-12-29 17:32 [PATCH] Fix PTP driver warnings by removing settime64 check Tinsae Tadesse
2025-12-29 19:13 ` Vadim Fedorenko
@ 2025-12-30 9:42 ` Paolo Abeni
2025-12-30 10:08 ` TINSAE TADESSE GUTEMA
1 sibling, 1 reply; 6+ messages in thread
From: Paolo Abeni @ 2025-12-30 9:42 UTC (permalink / raw)
To: Tinsae Tadesse, richardcochran, andrew+netdev, davem, edumazet,
kuba
Cc: netdev, linux-kernel
On 12/29/25 6:32 PM, Tinsae Tadesse wrote:
> Signed-off-by: Tinsae Tadesse <tinsaetadesse2015@gmail.com>
> ---
> drivers/ptp/ptp_clock.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
> index b0e167c0b3eb..5374b3e9ad15 100644
> --- a/drivers/ptp/ptp_clock.c
> +++ b/drivers/ptp/ptp_clock.c
> @@ -323,8 +323,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
> size_t size;
>
> if (WARN_ON_ONCE(info->n_alarm > PTP_MAX_ALARMS ||
> - (!info->gettimex64 && !info->gettime64) ||
> - !info->settime64))
> + (!info->gettimex64 && !info->gettime64)))
> return ERR_PTR(-EINVAL);
>
> /* Initialize a clock structure. */
I guess this is an attempt to address the following issue:
https://lore.kernel.org/all/20251108044822.GA3262936@ax162/
If so, it's already fixed by commit 81d90d93d22ca4f61833cba921dce9a0bd82218f
/P
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix PTP driver warnings by removing settime64 check
2025-12-30 9:42 ` Paolo Abeni
@ 2025-12-30 10:08 ` TINSAE TADESSE GUTEMA
0 siblings, 0 replies; 6+ messages in thread
From: TINSAE TADESSE GUTEMA @ 2025-12-30 10:08 UTC (permalink / raw)
To: Paolo Abeni
Cc: richardcochran, andrew+netdev, davem, edumazet, kuba, netdev,
linux-kernel
On Tue, Dec 30, 2025 at 12:42 PM Paolo Abeni <pabeni@redhat.com> wrote:
>
> On 12/29/25 6:32 PM, Tinsae Tadesse wrote:
> > Signed-off-by: Tinsae Tadesse <tinsaetadesse2015@gmail.com>
> > ---
> > drivers/ptp/ptp_clock.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
> > index b0e167c0b3eb..5374b3e9ad15 100644
> > --- a/drivers/ptp/ptp_clock.c
> > +++ b/drivers/ptp/ptp_clock.c
> > @@ -323,8 +323,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
> > size_t size;
> >
> > if (WARN_ON_ONCE(info->n_alarm > PTP_MAX_ALARMS ||
> > - (!info->gettimex64 && !info->gettime64) ||
> > - !info->settime64))
> > + (!info->gettimex64 && !info->gettime64)))
> > return ERR_PTR(-EINVAL);
> >
> > /* Initialize a clock structure. */
>
> I guess this is an attempt to address the following issue:
>
> https://lore.kernel.org/all/20251108044822.GA3262936@ax162/
>
> If so, it's already fixed by commit 81d90d93d22ca4f61833cba921dce9a0bd82218f
>
> /P
>
Hi Paolo,
Thanks for the update!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix PTP driver warnings by removing settime64 check
[not found] ` <CAJ12PfM3zkJCJLJ3dLtvab2t9O9Dqs8MnoEo=zDb5OcyAPDuJQ@mail.gmail.com>
@ 2025-12-30 10:59 ` Andrew Lunn
2025-12-30 11:50 ` TINSAE TADESSE GUTEMA
0 siblings, 1 reply; 6+ messages in thread
From: Andrew Lunn @ 2025-12-30 10:59 UTC (permalink / raw)
To: TINSAE TADESSE GUTEMA
Cc: Vadim Fedorenko, richardcochran, andrew+netdev, davem, edumazet,
kuba, pabeni, netdev, linux-kernel
> This patch resolves warnings triggered when either gettimex64 or settime64 are
> NULL.
> The CONFIG_PTP_1588_CLOCK=y option enables PTP support for all Ethernet
> devices.
> In systems with Intel-based network devices, both the iwlwifi and e1000e
> modules attempt to register clocks, resulting in calls to ptp_clock_register in
> drivers/ptp/ptp_clock.c that produce warnings if any function pointers are
> uninitialized.
>
> Without this patch, the following warning is logged during registration:
>
> info->n_alarm > PTP_MAX_ALARMS || (!info->gettimex64 && !info->gettime64) |
> | !info->settime64
> WARNING: drivers/ptp/ptp_clock.c:325 at ptp_clock_register+0x54/0xb70, CPU#
> 2: NetworkManager/1102
> ...
> iwlwifi 0000:00:14.3: Failed to register PHC clock (-22)
It seems this patch is no longer needed. But FYI, this explanation
should of been in the commit message. The commit message should
explain why a change is needed.
Andrew
---
pw-bot: cr
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix PTP driver warnings by removing settime64 check
2025-12-30 10:59 ` Andrew Lunn
@ 2025-12-30 11:50 ` TINSAE TADESSE GUTEMA
0 siblings, 0 replies; 6+ messages in thread
From: TINSAE TADESSE GUTEMA @ 2025-12-30 11:50 UTC (permalink / raw)
To: Andrew Lunn
Cc: Vadim Fedorenko, richardcochran, andrew+netdev, davem, edumazet,
kuba, pabeni, netdev, linux-kernel
On Tue, Dec 30, 2025 at 1:59 PM Andrew Lunn <andrew@lunn.ch> wrote:
>
> > This patch resolves warnings triggered when either gettimex64 or settime64 are
> > NULL.
> > The CONFIG_PTP_1588_CLOCK=y option enables PTP support for all Ethernet
> > devices.
> > In systems with Intel-based network devices, both the iwlwifi and e1000e
> > modules attempt to register clocks, resulting in calls to ptp_clock_register in
> > drivers/ptp/ptp_clock.c that produce warnings if any function pointers are
> > uninitialized.
> >
> > Without this patch, the following warning is logged during registration:
> >
> > info->n_alarm > PTP_MAX_ALARMS || (!info->gettimex64 && !info->gettime64) |
> > | !info->settime64
> > WARNING: drivers/ptp/ptp_clock.c:325 at ptp_clock_register+0x54/0xb70, CPU#
> > 2: NetworkManager/1102
> > ...
> > iwlwifi 0000:00:14.3: Failed to register PHC clock (-22)
>
> It seems this patch is no longer needed. But FYI, this explanation
> should of been in the commit message. The commit message should
> explain why a change is needed.
>
>
> Andrew
>
> ---
> pw-bot: cr
Hi Andrew,
Your suggestion is well noted, thank you!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-12-30 11:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-29 17:32 [PATCH] Fix PTP driver warnings by removing settime64 check Tinsae Tadesse
2025-12-29 19:13 ` Vadim Fedorenko
[not found] ` <CAJ12PfM3zkJCJLJ3dLtvab2t9O9Dqs8MnoEo=zDb5OcyAPDuJQ@mail.gmail.com>
2025-12-30 10:59 ` Andrew Lunn
2025-12-30 11:50 ` TINSAE TADESSE GUTEMA
2025-12-30 9:42 ` Paolo Abeni
2025-12-30 10:08 ` TINSAE TADESSE GUTEMA
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).