ptp: ocp: have adjtime handle negative delta_ns correctly
PATCH v2 1/1 ptp: ocp: have adjtime handle negative delta_ns correctly
delta_ns is a s64, but it was being passed ptp_ocp_adjtime_coarse as an u64. Also, it turns out that timespec64_add_ns() only handles positive values, so perform the math with set_normalized_timespec().
---v1->v2: Use set_normalized_timespec (Vadim)
--- drivers/ptp/ptp_ocp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/ptp/ptp_ocp.c +3 -2
@@ -841,7 +841,7 @@ __ptp_ocp_adjtime_locked(struct ptp_ocp *bp, u32 adj_val) }static void -ptp_ocp_adjtime_coarse (struct ptp_ocp *bp,u64 delta_ns) +ptp_ocp_adjtime_coarse (struct ptp_ocp *bp,s64 delta_ns) {struct timespec64 ts;unsigned long flags;
@@ -850,7 +850,8 @@ ptp_ocp_adjtime_coarse(struct ptp_ocp *bp, u64 delta_ns)spin_lock_irqsave (&bp->lock, flags); err =__ptp_ocp_gettime_locked (bp, &ts,NULL );if (likely (!err)) { -timespec64_add_ns (&ts, delta_ns); +set_normalized_timespec64 (&ts, ts.tv_sec, + ts.tv_nsec + delta_ns);__ptp_ocp_settime_locked (bp, &ts); }spin_unlock_irqrestore (&bp->lock, flags);
Signature · 1 line
2.31.1
Quoted 7 lines · Jonathan Lemon
delta_nsis a s64, but it was being passedptp_ocp_adjtime_coarseas an u64. Also, it turns out thattimespec64_add_ns()only handles positive values, so perform the math withset_normalized_timespec().Fixes 90f8f4c0e3ce ("ptp: ocp: Add ptp_ocp_adjtime_coarse for large adjustments")Suggested-by Vadim Fedorenko <[email protected]>Signed-off-by Jonathan Lemon <[email protected]>
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Fri, 13 May 2022 15:52:31 -0700 you wrote:
delta_nsis a s64, but it was being passedptp_ocp_adjtime_coarseas an u64. Also, it turns out thattimespec64_add_ns()only handles positive values, so perform the math withset_normalized_timespec().Fixes 90f8f4c0e3ce ("ptp: ocp: Add ptp_ocp_adjtime_coarse for large adjustments")Suggested-by Vadim Fedorenko <[email protected]>Signed-off-by Jonathan Lemon <[email protected]>[...]
Here is the summary with links:
- [net,v2] ptp: ocp: have adjtime handle negative delta_ns correctly
https://git.kernel.org/netdev/net/c/da2172a9bfec
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html