MIPS: malta-time: Take seconds into account

When estimating the clock frequency based on the RTC, take seconds into
account in case the Update In Progress (UIP) bit wasn't seen. This can
happen in virtual machines (which may get pre-empted by the hypervisor
at inopportune times) with QEMU emulating the RTC (and in fact not
setting the UIP bit for very long), especially on slow hosts such as
FPGA systems and hardware emulators. This results in several seconds
actually having elapsed before seeing the UIP bit instead of just one
second, and exaggerated timer frequencies.

While updating the comments, they're also fixed to match the code in
that the rising edge of the update flag is detected first, not the
falling edge.

The rising edge gives a more precise point to read the counters in a
virtualised system than the falling edge, resulting in a more accurate
frequency.

It does however mean that we have to also wait for the falling edge
before doing the read of the RTC seconds register, otherwise it seems to
be possible in slow hardware emulation to stray into the interval when
the RTC time is undefined during the update (at least 244uS after the
rising edge of the update flag). This can result in both seconds values
reading the same, and it wrapping to 60 seconds, vastly underestimating
the frequency.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/13174/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c
index 2539687b77f68a454cc56b0f6412af8ae29b2cca..7407da04f8d6bc1cf0da21b4800530087f7d0c88 100644 (file)
--- a/arch/mips/mti-malta/malta-time.c
+++ b/arch/mips/mti-malta/malta-time.c
@@ -21,6 +21,7 @@
 #include <linux/i8253.h>
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
+#include <linux/math64.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
@@ -72,6 +73,8 @@ static void __init estimate_frequencies(void)
 {
        unsigned long flags;
        unsigned int count, start;
+       unsigned char secs1, secs2, ctrl;
+       int secs;
        cycle_t giccount = 0, gicstart = 0;
 
 #if defined(CONFIG_KVM_GUEST) && CONFIG_KVM_GUEST_TIMER_FREQ
@@ -84,29 +87,48 @@ static void __init estimate_frequencies(void)
        if (gic_present)
                gic_start_count();
 
-       /* Read counter exactly on falling edge of update flag. */
+       /*
+        * Read counters exactly on rising edge of update flag.
+        * This helps get an accurate reading under virtualisation.
+        */
        while (CMOS_READ(RTC_REG_A) & RTC_UIP);
        while (!(CMOS_READ(RTC_REG_A) & RTC_UIP));
-
        start = read_c0_count();
        if (gic_present)
                gicstart = gic_read_count();
 
-       /* Read counter exactly on falling edge of update flag. */
+       /* Wait for falling edge before reading RTC. */
        while (CMOS_READ(RTC_REG_A) & RTC_UIP);
-       while (!(CMOS_READ(RTC_REG_A) & RTC_UIP));
+       secs1 = CMOS_READ(RTC_SECONDS);
 
+       /* Read counters again exactly on rising edge of update flag. */
+       while (!(CMOS_READ(RTC_REG_A) & RTC_UIP));
        count = read_c0_count();
        if (gic_present)
                giccount = gic_read_count();
 
+       /* Wait for falling edge before reading RTC again. */
+       while (CMOS_READ(RTC_REG_A) & RTC_UIP);
+       secs2 = CMOS_READ(RTC_SECONDS);
+
+       ctrl = CMOS_READ(RTC_CONTROL);
+
        local_irq_restore(flags);
 
+       if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
+               secs1 = bcd2bin(secs1);
+               secs2 = bcd2bin(secs2);
+       }
+       secs = secs2 - secs1;
+       if (secs < 1)
+               secs += 60;
+
        count -= start;
+       count /= secs;
        mips_hpt_frequency = count;
 
        if (gic_present) {
-               giccount -= gicstart;
+               giccount = div_u64(giccount - gicstart, secs);
                gic_frequency = giccount;
        }
 }