ntp: Move pps_jitter into ntp_data

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-17-2d52f4e13476@linutronix.de

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 6a1ba27473fc21c576a950603c171d64781c7b59..576f86a6a4f17bc6aac9978611582eb7a5de9e83 100644 (file)
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -42,6 +42,7 @@
  *
  * @pps_valid:         PPS signal watchdog counter
  * @pps_tf:            PPS phase median filter
+ * @pps_jitter:                PPS current jitter in nanoseconds
  *
  * Protected by the timekeeping locks.
  */
@@ -63,6 +64,7 @@ struct ntp_data {
 #ifdef CONFIG_NTP_PPS
        int                     pps_valid;
        long                    pps_tf[3];
+       long                    pps_jitter;
 #endif
 };
 
@@ -98,7 +100,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_jitter;                /* current jitter (ns) */
 static struct timespec64 pps_fbase; /* beginning of the last freq interval */
 static int pps_shift;          /* current interval duration (s) (shift) */
 static int pps_intcnt;         /* interval counter */
@@ -194,9 +195,9 @@ static inline void pps_fill_timex(struct ntp_data *ntpdata, struct __kernel_time
 {
        txc->ppsfreq       = shift_right((pps_freq >> PPM_SCALE_INV_SHIFT) *
                                         PPM_SCALE_INV, NTP_SCALE_SHIFT);
-       txc->jitter        = pps_jitter;
+       txc->jitter        = ntpdata->pps_jitter;
        if (!(ntpdata->time_status & STA_NANO))
-               txc->jitter = pps_jitter / NSEC_PER_USEC;
+               txc->jitter = ntpdata->pps_jitter / NSEC_PER_USEC;
        txc->shift         = pps_shift;
        txc->stabil        = pps_stabil;
        txc->jitcnt        = pps_jitcnt;
@@ -998,9 +999,9 @@ static void hardpps_update_phase(struct ntp_data *ntpdata, long error)
         * threshold, the sample is discarded; otherwise, if so enabled,
         * the time offset is updated.
         */
-       if (jitter > (pps_jitter << PPS_POPCORN)) {
+       if (jitter > (ntpdata->pps_jitter << PPS_POPCORN)) {
                printk_deferred(KERN_WARNING "hardpps: PPSJITTER: jitter=%ld, limit=%ld\n",
-                               jitter, (pps_jitter << PPS_POPCORN));
+                               jitter, (ntpdata->pps_jitter << PPS_POPCORN));
                ntpdata->time_status |= STA_PPSJITTER;
                pps_jitcnt++;
        } else if (ntpdata->time_status & STA_PPSTIME) {
@@ -1011,7 +1012,7 @@ static void hardpps_update_phase(struct ntp_data *ntpdata, long error)
                ntpdata->time_adjust = 0;
        }
        /* Update jitter */
-       pps_jitter += (jitter - pps_jitter) >> PPS_INTMIN;
+       ntpdata->pps_jitter += (jitter - ntpdata->pps_jitter) >> PPS_INTMIN;
 }
 
 /*