[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240911-devel-anna-maria-b4-timers-ptp-ntp-v1-15-2d52f4e13476@linutronix.de>
Date: Wed, 11 Sep 2024 15:17:51 +0200
From: Anna-Maria Behnsen <anna-maria@...utronix.de>
To: John Stultz <jstultz@...gle.com>,
Frederic Weisbecker <frederic@...nel.org>,
Thomas Gleixner <tglx@...utronix.de>
Cc: linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
Miroslav Lichvar <mlichvar@...hat.com>,
Richard Cochran <richardcochran@...il.com>,
Christopher S Hall <christopher.s.hall@...el.com>,
Anna-Maria Behnsen <anna-maria@...utronix.de>
Subject: [PATCH 15/21] ntp: Move pps_valid into ntp_data
From: Thomas Gleixner <tglx@...utronix.de>
Continue the conversion from static variables to struct based data.
No functional change.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: Anna-Maria Behnsen <anna-maria@...utronix.de>
---
kernel/time/ntp.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 33d52b9dbff6..35cca57e017e 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -40,6 +40,8 @@
* @ntp_tick_adj: Constant boot-param configurable NTP tick adjustment (upscaled)
* @ntp_next_leap_sec: Second value of the next pending leapsecond, or TIME64_MAX if no leap
*
+ * @pps_valid: PPS signal watchdog counter
+ *
* Protected by the timekeeping locks.
*/
struct ntp_data {
@@ -57,6 +59,9 @@ struct ntp_data {
long time_adjust;
s64 ntp_tick_adj;
time64_t ntp_next_leap_sec;
+#ifdef CONFIG_NTP_PPS
+ int pps_valid;
+#endif
};
static struct ntp_data tk_ntp_data = {
@@ -91,7 +96,6 @@ static struct ntp_data tk_ntp_data = {
intervals to decrease it */
#define PPS_MAXWANDER 100000 /* max PPS freq wander (ns/s) */
-static int pps_valid; /* signal watchdog counter */
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 */
@@ -147,9 +151,9 @@ static inline void pps_clear(void)
*/
static inline void pps_dec_valid(struct ntp_data *ntpdata)
{
- if (pps_valid > 0)
- pps_valid--;
- else {
+ if (ntpdata->pps_valid > 0) {
+ ntpdata->pps_valid--;
+ } else {
ntpdata->time_status &= ~(STA_PPSSIGNAL | STA_PPSJITTER |
STA_PPSWANDER | STA_PPSERROR);
pps_clear();
@@ -1024,7 +1028,7 @@ void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_t
/* indicate signal presence */
ntpdata->time_status |= STA_PPSSIGNAL;
- pps_valid = PPS_VALID;
+ ntpdata->pps_valid = PPS_VALID;
/*
* When called for the first time, just start the frequency
--
2.39.2
Powered by blists - more mailing lists