Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit da2172a

Browse files
jlemonkuba-moo
authored andcommitted
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(). Fixes: 90f8f4c ("ptp: ocp: Add ptp_ocp_adjtime_coarse for large adjustments") Suggested-by: Vadim Fedorenko <[email protected]> Signed-off-by: Jonathan Lemon <[email protected]> Acked-by: Vadim Fedorenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 4d42d54 commit da2172a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/ptp/ptp_ocp.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ __ptp_ocp_adjtime_locked(struct ptp_ocp *bp, u32 adj_val)
841841
}
842842

843843
static void
844-
ptp_ocp_adjtime_coarse(struct ptp_ocp *bp, u64 delta_ns)
844+
ptp_ocp_adjtime_coarse(struct ptp_ocp *bp, s64 delta_ns)
845845
{
846846
struct timespec64 ts;
847847
unsigned long flags;
@@ -850,7 +850,8 @@ ptp_ocp_adjtime_coarse(struct ptp_ocp *bp, u64 delta_ns)
850850
spin_lock_irqsave(&bp->lock, flags);
851851
err = __ptp_ocp_gettime_locked(bp, &ts, NULL);
852852
if (likely(!err)) {
853-
timespec64_add_ns(&ts, delta_ns);
853+
set_normalized_timespec64(&ts, ts.tv_sec,
854+
ts.tv_nsec + delta_ns);
854855
__ptp_ocp_settime_locked(bp, &ts);
855856
}
856857
spin_unlock_irqrestore(&bp->lock, flags);

0 commit comments

Comments
 (0)