mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-16 23:36:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

ntp: Move pps_ft into ntp_data

Browse Source 
Continue the conversion from static variables to struct based data.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: John Stultz <jstultz@google.com>
Link: https://lore.kernel.org/all/20240911-devel-anna-maria-b4-timers-ptp-ntp-v1-16-2d52f4e13476@linutronix.de
This commit is contained in:
Thomas Gleixner
2024-09-11 15:17:52 +02:00
parent 931a177f70
commit 5cc953b8ae
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
kernel/time/ntp.c
View File

@@ -41,6 +41,7 @@
* @ntp_next_leap_sec: Second value of the next pending leapsecond, or TIME64_MAX if no leap
*
* @pps_valid: PPS signal watchdog counter
* @pps_tf: PPS phase median filter
*
* Protected by the timekeeping locks.
*/
@@ -61,6 +62,7 @@ struct ntp_data {
time64_t ntp_next_leap_sec;
#ifdef CONFIG_NTP_PPS
int pps_valid;
long pps_tf[3];
#endif
};
@@ -96,7 +98,6 @@ static struct ntp_data tk_ntp_data = {
intervals to decrease it */
#define PPS_MAXWANDER 100000 /* max PPS freq wander (ns/s) */
static long pps_tf[3]; /* phase median filter */
static long pps_jitter; /* current jitter (ns) */
static struct timespec64 pps_fbase; /* beginning of the last freq interval */
static int pps_shift; /* current interval duration (s) (shift) */
@@ -134,13 +135,14 @@ static inline void pps_reset_freq_interval(void)
/**
* pps_clear - Clears the PPS state variables
* @ntpdata: Pointer to ntp data
*/
static inline void pps_clear(void)
static inline void pps_clear(struct ntp_data *ntpdata)
{
pps_reset_freq_interval();
pps_tf[0] = 0;
pps_tf[1] = 0;
pps_tf[2] = 0;
ntpdata->pps_tf[0] = 0;
ntpdata->pps_tf[1] = 0;
ntpdata->pps_tf[2] = 0;
pps_fbase.tv_sec = pps_fbase.tv_nsec = 0;
pps_freq = 0;
}
@@ -156,7 +158,7 @@ static inline void pps_dec_valid(struct ntp_data *ntpdata)
} else {
ntpdata->time_status &= ~(STA_PPSSIGNAL | STA_PPSJITTER |
STA_PPSWANDER | STA_PPSERROR);
pps_clear();
pps_clear(ntpdata);
}
}
@@ -211,7 +213,7 @@ static inline s64 ntp_offset_chunk(struct ntp_data *ntpdata, s64 offset)
}
static inline void pps_reset_freq_interval(void) {}
static inline void pps_clear(void) {}
static inline void pps_clear(struct ntp_data *ntpdata) {}
static inline void pps_dec_valid(struct ntp_data *ntpdata) {}
static inline void pps_set_freq(s64 freq) {}
@@ -337,7 +339,7 @@ static void __ntp_clear(struct ntp_data *ntpdata)
ntpdata->ntp_next_leap_sec = TIME64_MAX;
/* Clear PPS state variables */
pps_clear();
pps_clear(ntpdata);
}
/**
@@ -870,22 +872,22 @@ static inline struct pps_normtime pps_normalize_ts(struct timespec64 ts)
}
/* Get current phase correction and jitter */
static inline long pps_phase_filter_get(long *jitter)
static inline long pps_phase_filter_get(struct ntp_data *ntpdata, long *jitter)
{
*jitter = pps_tf[0] - pps_tf[1];
*jitter = ntpdata->pps_tf[0] - ntpdata->pps_tf[1];
if (*jitter < 0)
*jitter = -*jitter;
/* TODO: test various filters */
return pps_tf[0];
return ntpdata->pps_tf[0];
}
/* Add the sample to the phase filter */
static inline void pps_phase_filter_add(long err)
static inline void pps_phase_filter_add(struct ntp_data *ntpdata, long err)
{
pps_tf[2] = pps_tf[1];
pps_tf[1] = pps_tf[0];
pps_tf[0] = err;
ntpdata->pps_tf[2] = ntpdata->pps_tf[1];
ntpdata->pps_tf[1] = ntpdata->pps_tf[0];
ntpdata->pps_tf[0] = err;
}
/*
@@ -988,8 +990,8 @@ static void hardpps_update_phase(struct ntp_data *ntpdata, long error)
long jitter;
/* Add the sample to the median filter */
pps_phase_filter_add(correction);
correction = pps_phase_filter_get(&jitter);
pps_phase_filter_add(ntpdata, correction);
correction = pps_phase_filter_get(ntpdata, &jitter);
/*
* Nominal jitter is due to PPS signal noise. If it exceeds the