github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-29 10:41:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'net-stmmac-allow-generation-of-flexible-pps-relative-to-mac-time'

Browse Source 
Gatien Chevallier says:

====================
net: stmmac: allow generation of flexible PPS relative to MAC time

When doing some testing on stm32mp2x platforms(MACv5), I noticed that
the command previously used with a MACv4 for genering a PPS signal:
echo "0 0 0 1 1" > /sys/class/ptp/ptp0/period
did not work.

This is because the arguments passed through this command must contain
the start time at which the PPS should be generated, relative to the
MAC system time. For some reason, a time set in the past seems to work
with a MACv4.

Because passing such an argument is tedious, consider that any time
set in the past is an offset regarding the MAC system time. This way,
this does not impact existing scripts and the past time use case is
handled. Edit: But maybe that's not important and we can just change
the default behavior to this.

Example to generate a flexible PPS signal that has a 1s period 3s
relative to when the command was entered:

echo "0 3 0 1 1" > /sys/class/ptp/ptp0/period
====================

Link: https://patch.msgid.link/20250901-relative_flex_pps-v4-0-b874971dfe85@foss.st.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2025-09-03 16:51:12 -07:00
commit 648d628db5
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
View File

@ -10,6 +10,8 @@
#include "stmmac.h"
#include "stmmac_ptp.h"
#define PTP_SAFE_TIME_OFFSET_NS 500000
/**
* stmmac_adjust_freq
*
@ -171,7 +173,11 @@ static int stmmac_enable(struct ptp_clock_info *ptp,
u32 acr_value;
switch (rq->type) {
case PTP_CLK_REQ_PEROUT:
case PTP_CLK_REQ_PEROUT: {
struct timespec64 curr_time;
u64 target_ns = 0;
u64 ns = 0;
/* Reject requests with unsupported flags */
if (rq->perout.flags)
return -EOPNOTSUPP;
@ -180,6 +186,31 @@ static int stmmac_enable(struct ptp_clock_info *ptp,
cfg->start.tv_sec = rq->perout.start.sec;
cfg->start.tv_nsec = rq->perout.start.nsec;
/* A time set in the past won't trigger the start of the flexible PPS generation for
* the GMAC5. For some reason it does for the GMAC4 but setting a time in the past
* should be addressed anyway. Therefore, any value set it the past is considered as
* an offset compared to the current MAC system time.
* Be aware that an offset too low may not trigger flexible PPS generation
* if time spent in this configuration makes the targeted time already outdated.
* To address this, add a safe time offset.
*/
if (!cfg->start.tv_sec && cfg->start.tv_nsec < PTP_SAFE_TIME_OFFSET_NS)
cfg->start.tv_nsec += PTP_SAFE_TIME_OFFSET_NS;
target_ns = cfg->start.tv_nsec + ((u64)cfg->start.tv_sec * NSEC_PER_SEC);
stmmac_get_systime(priv, priv->ptpaddr, &ns);
if (ns > TIME64_MAX - PTP_SAFE_TIME_OFFSET_NS)
return -EINVAL;
curr_time = ns_to_timespec64(ns);
if (target_ns < ns + PTP_SAFE_TIME_OFFSET_NS) {
cfg->start = timespec64_add_safe(cfg->start, curr_time);
if (cfg->start.tv_sec == TIME64_MAX)
return -EINVAL;
}
cfg->period.tv_sec = rq->perout.period.sec;
cfg->period.tv_nsec = rq->perout.period.nsec;
@ -190,6 +221,7 @@ static int stmmac_enable(struct ptp_clock_info *ptp,
priv->systime_flags);
write_unlock_irqrestore(&priv->ptp_lock, flags);
break;
}
case PTP_CLK_REQ_EXTTS: {
u8 channel;

1
kernel/time/time.c
View File

@ -858,6 +858,7 @@ struct timespec64 timespec64_add_safe(const struct timespec64 lhs,
return res;
}
EXPORT_SYMBOL_GPL(timespec64_add_safe);
/**
* get_timespec64 - get user's time value into kernel space