* [PATCH net-next] Let the ADJ_OFFSET interface respect the STA_NANO flag for PHC devices.
@ 2020-05-24 13:28 Richard Cochran
2020-05-24 17:57 ` Richard Cochran
0 siblings, 1 reply; 2+ messages in thread
From: Richard Cochran @ 2020-05-24 13:28 UTC (permalink / raw)
To: netdev; +Cc: David Miller, Miroslav Lichvar, John Stultz, Vincent Cheng
In commit 184ecc9eb260d5a3bcdddc5bebd18f285ac004e9 ("ptp: Add adjphase
function to support phase offset control.") the PTP Hardware Clock
interface expanded to support the ADJ_OFFSET offset mode. However,
the implementation did not respect the traditional yet pedantic
distinction between units of microseconds and nanoseconds signaled by
the STA_NANO flag. This patch fixes the issue by adding logic to
handle that flag.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
drivers/ptp/ptp_clock.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index fc984a8828fb..7ae6e8e85f99 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -147,8 +147,13 @@ static int ptp_clock_adjtime(struct posix_clock *pc, struct __kernel_timex *tx)
err = ops->adjfreq(ops, ppb);
ptp->dialed_frequency = tx->freq;
} else if (tx->modes & ADJ_OFFSET) {
- if (ops->adjphase)
- err = ops->adjphase(ops, tx->offset);
+ if (ops->adjphase) {
+ s32 offset = tx->offset;
+ if (!(tx->status & STA_NANO)) {
+ offset *= NSEC_PER_USEC;
+ }
+ err = ops->adjphase(ops, offset);
+ }
} else if (tx->modes == 0) {
tx->freq = ptp->dialed_frequency;
err = 0;
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] Let the ADJ_OFFSET interface respect the STA_NANO flag for PHC devices.
2020-05-24 13:28 [PATCH net-next] Let the ADJ_OFFSET interface respect the STA_NANO flag for PHC devices Richard Cochran
@ 2020-05-24 17:57 ` Richard Cochran
0 siblings, 0 replies; 2+ messages in thread
From: Richard Cochran @ 2020-05-24 17:57 UTC (permalink / raw)
To: netdev; +Cc: David Miller, Miroslav Lichvar, John Stultz, Vincent Cheng
On Sun, May 24, 2020 at 06:28:00AM -0700, Richard Cochran wrote:
> @@ -147,8 +147,13 @@ static int ptp_clock_adjtime(struct posix_clock *pc, struct __kernel_timex *tx)
> err = ops->adjfreq(ops, ppb);
> ptp->dialed_frequency = tx->freq;
> } else if (tx->modes & ADJ_OFFSET) {
> - if (ops->adjphase)
> - err = ops->adjphase(ops, tx->offset);
> + if (ops->adjphase) {
> + s32 offset = tx->offset;
> + if (!(tx->status & STA_NANO)) {
> + offset *= NSEC_PER_USEC;
Oh man. This should check for ADJ_NANO instead. V2 follows soon...
Thanks,
Richard
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-24 17:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-24 13:28 [PATCH net-next] Let the ADJ_OFFSET interface respect the STA_NANO flag for PHC devices Richard Cochran
2020-05-24 17:57 ` Richard Cochran
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).