[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <77692ba8903c3d1a5f377517d149f3c1d125f4e3.1470122380.git.panand@redhat.com>
Date: Tue, 2 Aug 2016 12:57:00 +0530
From: Pratyush Anand <panand@...hat.com>
To: mingo@...nel.org, alexandre.belloni@...e-electrons.com,
tglx@...utronix.de, hpa@...or.com, x86@...nel.org
Cc: rtc-linux@...glegroups.com, linux-kernel@...r.kernel.org,
prarit@...hat.com, dyoung@...hat.com, a.zummo@...ertech.it,
Pratyush Anand <panand@...hat.com>
Subject: [PATCH V2 2/2] rtc/rtc-cmos: Initialize software counters before irq is registered
We have observed on few machines with rtc-cmos device that
hpet_rtc_interrupt() is called before cmos_do_probe() could call
hpet_rtc_timer_init(). It has not been observed during normal boot/reboot
of machines. It *sometime* happens when system is booted with kdump
secondary kernel. So, neither hpet_default_delta nor hpet_t1_cmp is
initialized by the time interrupt is raised in the given situation.
Therefore while loop of hpet_cnt_ahead() in hpet_rtc_timer_reinit() never
completes. This leads to "NMI watchdog: Watchdog detected hard LOCKUP on
cpu 0".
Software counters are being initialized in this patch so that LOCKUP could
be avoided.
Signed-off-by: Pratyush Anand <panand@...hat.com>
---
drivers/rtc/rtc-cmos.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index fbe9c72438e1..101dc948295f 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -129,6 +129,16 @@ static inline int hpet_rtc_dropped_irq(void)
return 0;
}
+static inline int hpet_rtc_timer_counter_init(void)
+{
+ return 0;
+}
+
+static inline int hpet_rtc_timer_enable(void)
+{
+ return 0;
+}
+
static inline int hpet_rtc_timer_init(void)
{
return 0;
@@ -710,6 +720,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
goto cleanup1;
}
+ hpet_rtc_timer_counter_init();
if (is_valid_irq(rtc_irq)) {
irq_handler_t rtc_cmos_int_handler;
@@ -732,7 +743,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
goto cleanup1;
}
}
- hpet_rtc_timer_init();
+ hpet_rtc_timer_enable();
/* export at least the first block of NVRAM */
nvram.size = address_space - NVRAM_OFFSET;
--
2.5.5
Powered by blists - more mailing lists