mirror of
https://github.com/apache/nuttx.git
synced 2026-05-18 00:34:10 +08:00
752a405f86
This patch implements clock_adjtime() with CLOCKFD support, enabling
precise time and frequency adjustments for PTP clocks through the
standard POSIX clock API.
Key changes include:
1. New clock_adjtime() system call:
- Added sched/clock/clock_adjtime.c implementation
- Provides POSIX-compliant time adjustment interface
- Supports both standard clocks and CLOCKFD-based dynamic clocks
- Added CONFIG_CLOCK_ADJTIME Kconfig option
2. CLOCKFD support in clock_adjtime():
- Detects CLOCKFD-encoded clockids via CLOCKFD_TO_FD() check
- Extracts file descriptor and validates through fs_getfilep()
- Issues PTP_CLOCK_ADJTIME ioctl to underlying PTP clock device
- Returns clock status and adjustment results via struct timex
3. Enhanced struct timex support:
- Extended include/sys/timex.h with additional ADJ_* flags
- Added ADJ_OFFSET, ADJ_FREQUENCY, ADJ_MAXERROR, ADJ_ESTERROR
- Added ADJ_STATUS, ADJ_TIMECONST, ADJ_TAI, ADJ_SETOFFSET
- Added ADJ_MICRO, ADJ_NANO for time unit selection
- Added STA_* status flags for clock state reporting
4. Clock operations supported:
- ADJ_SETOFFSET: Apply time offset adjustment
- ADJ_FREQUENCY: Adjust clock frequency (PPM)
- ADJ_MAXERROR: Set maximum error estimate
- ADJ_ESTERROR: Set estimated error
- ADJ_STATUS: Modify clock status bits
- ADJ_NANO: Use nanosecond resolution
- ADJ_SETOFFSET: Set absolute time offset
5. API declarations:
- Added clock_adjtime() prototype in include/nuttx/clock.h
- Enabled by CONFIG_CLOCK_ADJTIME configuration
- Compatible with Linux clock_adjtime() interface
Usage example:
int fd = open("/dev/ptp0", O_RDWR);
struct timex tx = {0};
tx.modes = ADJ_FREQUENCY;
tx.freq = 10000000; /* Adjust frequency by 10 PPM */
clock_adjtime(CLOCKFD(fd), &tx);
close(fd);
This completes the PTP clock framework's POSIX clock API integration,
providing comprehensive time control capabilities for precision timing
applications including PTP synchronization daemons (ptp4l, timemaster).
Signed-off-by: dongjiuzhu1 <dongjiuzhu1@xiaomi.com>
313 lines
9.2 KiB
C
313 lines
9.2 KiB
C
/****************************************************************************
|
|
* sched/clock/clock_adjtime.c
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership. The
|
|
* ASF licenses this file to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance with the
|
|
* License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
|
|
#ifdef CONFIG_CLOCK_ADJTIME
|
|
|
|
#include <sys/time.h>
|
|
#include <stdint.h>
|
|
#include <time.h>
|
|
#include <errno.h>
|
|
#include <debug.h>
|
|
|
|
#include <nuttx/irq.h>
|
|
#include <nuttx/arch.h>
|
|
#include <nuttx/spinlock.h>
|
|
#include <nuttx/fs/fs.h>
|
|
#include <nuttx/timers/ptp_clock.h>
|
|
|
|
#include "clock/clock.h"
|
|
|
|
/****************************************************************************
|
|
* Pre-processor Definitions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Private Data
|
|
****************************************************************************/
|
|
|
|
static struct wdog_s g_adjtime_wdog;
|
|
static long g_adjtime_ppb;
|
|
static spinlock_t g_adjtime_lock = SP_UNLOCKED;
|
|
|
|
/****************************************************************************
|
|
* Private Functions
|
|
****************************************************************************/
|
|
|
|
/* Restore default rate after adjustment period expires */
|
|
|
|
static void adjtime_wdog_callback(wdparm_t arg)
|
|
{
|
|
irqstate_t flags;
|
|
|
|
UNUSED(arg);
|
|
|
|
flags = spin_lock_irqsave(&g_adjtime_lock);
|
|
|
|
#ifdef CONFIG_ARCH_HAVE_ADJTIME
|
|
up_adjtime(0);
|
|
#endif
|
|
|
|
#ifdef CONFIG_RTC_ADJTIME
|
|
up_rtc_adjtime(0);
|
|
#endif
|
|
|
|
g_adjtime_ppb = 0;
|
|
spin_unlock_irqrestore(&g_adjtime_lock, flags);
|
|
}
|
|
|
|
/* Query remaining adjustment in microseconds */
|
|
|
|
static long long adjtime_remaining_usec(void)
|
|
{
|
|
return (long long)g_adjtime_ppb
|
|
* TICK2MSEC(wd_gettime(&g_adjtime_wdog))
|
|
/ (MSEC_PER_SEC * NSEC_PER_USEC);
|
|
}
|
|
|
|
/* Start new adjustment period */
|
|
|
|
static int adjtime_start(long long adjust_usec)
|
|
{
|
|
long long ppb;
|
|
long long ppb_limit;
|
|
irqstate_t flags;
|
|
int ret = OK;
|
|
|
|
/* Calculate rate adjustmend to get adjust_usec change over the
|
|
* CONFIG_CLOCK_ADJTIME_PERIOD_MS.
|
|
*/
|
|
|
|
ppb = adjust_usec * NSEC_PER_USEC;
|
|
ppb = ppb * MSEC_PER_SEC / CONFIG_CLOCK_ADJTIME_PERIOD_MS;
|
|
|
|
/* Limit to maximum rate adjustment */
|
|
|
|
ppb_limit = CONFIG_CLOCK_ADJTIME_SLEWLIMIT_PPM * 1000;
|
|
if (ppb > ppb_limit)
|
|
{
|
|
ppb = ppb_limit;
|
|
}
|
|
else if (ppb < -ppb_limit)
|
|
{
|
|
ppb = -ppb_limit;
|
|
}
|
|
|
|
flags = spin_lock_irqsave_nopreempt(&g_adjtime_lock);
|
|
|
|
/* Set new adjustment */
|
|
|
|
g_adjtime_ppb = ppb;
|
|
|
|
#ifdef CONFIG_ARCH_HAVE_ADJTIME
|
|
up_adjtime(g_adjtime_ppb);
|
|
#endif
|
|
|
|
#ifdef CONFIG_RTC_ADJTIME
|
|
ret = up_rtc_adjtime(g_adjtime_ppb);
|
|
#endif
|
|
|
|
/* Queue cancellation of adjustment after configured period */
|
|
|
|
if (g_adjtime_ppb != 0)
|
|
{
|
|
wd_start(&g_adjtime_wdog, MSEC2TICK(CONFIG_CLOCK_ADJTIME_PERIOD_MS),
|
|
adjtime_wdog_callback, 0);
|
|
}
|
|
else
|
|
{
|
|
wd_cancel(&g_adjtime_wdog);
|
|
}
|
|
|
|
spin_unlock_irqrestore_nopreempt(&g_adjtime_lock, flags);
|
|
|
|
return ret;
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: adjtime
|
|
*
|
|
* Description:
|
|
* The adjtime() function gradually adjusts the system clock (as returned
|
|
* by gettimeofday(2)). The amount of time by which the clock is to be
|
|
* adjusted is specified in the structure pointed to by delta.
|
|
*
|
|
* This structure has the following form:
|
|
*
|
|
* struct timeval
|
|
* {
|
|
* time_t tv_sec; (seconds)
|
|
* long tv_usec; (microseconds)
|
|
* };
|
|
*
|
|
* If the adjustment in delta is positive, then the system clock is
|
|
* speeded up by some small percentage until the adjustment has been
|
|
* completed. If the adjustment in delta is negative, then the clock is
|
|
* slowed down in a similar fashion.
|
|
*
|
|
* If a clock adjustment from an earlier adjtime() call is already in
|
|
* progress at the time of a later adjtime() call, and delta is not NULL
|
|
* for the later call, then the earlier adjustment is stopped, but any
|
|
* already completed part of that adjustment is not undone.
|
|
*
|
|
* If olddelta is not NULL, then the buffer that it points to is used to
|
|
* return the amount of time remaining from any previous adjustment that
|
|
* has not yet been completed.
|
|
*
|
|
* NOTE: This is not a POSIX interface but derives from 4.3BSD, System V.
|
|
* It is also supported for Linux compatibility.
|
|
*
|
|
****************************************************************************/
|
|
|
|
int adjtime(FAR const struct timeval *delta, FAR struct timeval *olddelta)
|
|
{
|
|
long long adjust_usec = 0;
|
|
long long adjust_usec_old = 0;
|
|
int ret = OK;
|
|
|
|
if (olddelta)
|
|
{
|
|
adjust_usec_old = adjtime_remaining_usec();
|
|
olddelta->tv_sec = adjust_usec_old / USEC_PER_SEC;
|
|
olddelta->tv_usec = adjust_usec_old;
|
|
}
|
|
|
|
if (delta)
|
|
{
|
|
adjust_usec = (long long)delta->tv_sec * USEC_PER_SEC + delta->tv_usec;
|
|
ret = adjtime_start(adjust_usec);
|
|
}
|
|
|
|
if (ret < 0)
|
|
{
|
|
set_errno(-ret);
|
|
return -1;
|
|
}
|
|
else
|
|
{
|
|
return OK;
|
|
}
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Name: nxclock_adjtime
|
|
*
|
|
* Description:
|
|
* Adjust the frequency and/or phase of a clock.
|
|
* This function allows the adjustment of the frequency and/or phase of a
|
|
* specified clock. It can be used to synchronize the clock with an
|
|
* external time source or to apply a frequency offset.
|
|
*
|
|
* Input Parameters:
|
|
* clk_id - The identifier of the clock to be adjusted. This is typically
|
|
* one of the predefined clock IDs such as CLOCK_REALTIME,
|
|
* CLOCK_MONOTONIC, or CLOCK_BOOTTIME.
|
|
*
|
|
* buf - A pointer to a `timex` structure that specifies the adjustment
|
|
* parameters. This structure includes fields for the frequency
|
|
* adjustment (`freq`), the maximum frequency error (`maxerror`),
|
|
* the estimated error (`esterror`), the phase offset (`offset`),
|
|
* and flags to indicate the type of adjustment (`status`).
|
|
*
|
|
* Returned Value:
|
|
* Return On success, the function returns 0. On error, it returns
|
|
* -1 and sets 'errno` to indicate the specific error that
|
|
* occurred.
|
|
*
|
|
****************************************************************************/
|
|
|
|
int nxclock_adjtime(clockid_t clock_id, FAR struct timex *buf)
|
|
{
|
|
int ret = -EINVAL;
|
|
|
|
#ifdef CONFIG_PTP_CLOCK
|
|
if ((clock_id & CLOCK_MASK) == CLOCK_FD)
|
|
{
|
|
FAR struct file *filep;
|
|
|
|
ret = ptp_clockid_to_filep(clock_id, &filep);
|
|
if (ret < 0)
|
|
{
|
|
return ret;
|
|
}
|
|
|
|
ret = file_ioctl(filep, PTP_CLOCK_ADJTIME,
|
|
(unsigned long)(uintptr_t)buf);
|
|
fs_putfilep(filep);
|
|
}
|
|
#endif
|
|
|
|
return ret;
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Name: clock_adjtime
|
|
*
|
|
* Description:
|
|
* Adjust the frequency and/or phase of a clock.
|
|
* This function allows the adjustment of the frequency and/or phase of a
|
|
* specified clock. It can be used to synchronize the clock with an
|
|
* external time source or to apply a frequency offset.
|
|
*
|
|
* Input Parameters:
|
|
* clk_id - The identifier of the clock to be adjusted. This is typically
|
|
* one of the predefined clock IDs such as CLOCK_REALTIME,
|
|
* CLOCK_MONOTONIC, or CLOCK_BOOTTIME.
|
|
*
|
|
* buf - A pointer to a `timex` structure that specifies the adjustment
|
|
* parameters. This structure includes fields for the frequency
|
|
* adjustment (`freq`), the maximum frequency error (`maxerror`),
|
|
* the estimated error (`esterror`), the phase offset (`offset`),
|
|
* and flags to indicate the type of adjustment (`status`).
|
|
*
|
|
* Returned Value:
|
|
* Return On success, the function returns 0. On error, it returns
|
|
* -1 and sets 'errno` to indicate the specific error that
|
|
* occurred.
|
|
*
|
|
****************************************************************************/
|
|
|
|
int clock_adjtime(clockid_t clk_id, FAR struct timex *buf)
|
|
{
|
|
int ret;
|
|
|
|
ret = nxclock_adjtime(clk_id, buf);
|
|
if (ret < 0)
|
|
{
|
|
set_errno(-ret);
|
|
return ERROR;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
#endif /* CONFIG_CLOCK_ADJTIME */
|