x86: add warning when RTC clock reports binary

We assume that the RTC clock is BCD, so print a warning if it claims
to be binary.

[ tglx@linutronix.de: changed to WARN_ON - we want to know that!
  If no one reports it we can remove the complete if (RTC_ALWAYS_BCD)
  magic, which has RTC_ALWAYS_BCD defined to 1 since Linux 1.0 ... ]

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index d2569513ad4cd41b9876141c2b6208527ea095de..d4d8277e890e12252d13400581d3951831bbbf7a 100644 (file)
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -94,7 +94,7 @@ int mach_set_rtc_mmss(unsigned long nowtime)
 
 unsigned long mach_get_cmos_time(void)
 {
-       unsigned int year, mon, day, hour, min, sec, century = 0;
+       unsigned int status, year, mon, day, hour, min, sec, century = 0;
 
        /*
         * If UIP is clear, then we have >= 244 microseconds before
@@ -119,7 +119,10 @@ unsigned long mach_get_cmos_time(void)
                century = CMOS_READ(acpi_gbl_FADT.century);
 #endif
 
-       if (RTC_ALWAYS_BCD || !(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)) {
+       status = CMOS_READ(RTC_CONTROL);
+       WARN_ON_ONCE((RTC_ALWAYS_BCD && (status & RTC_DM_BINARY));
+
+       if (RTC_ALWAYS_BCD || !(status & RTC_DM_BINARY)) {
                BCD_TO_BIN(sec);
                BCD_TO_BIN(min);
                BCD_TO_BIN(hour);