| Message ID | 20160809195528.1604312-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Headers | show |
Hi On 08/09/2016 10:54 PM, Arnd Bergmann wrote: > Ville Syrjälä reports "The first time I run hwclock after rebooting > I get this: > > open("/dev/rtc", O_RDONLY) = 3 > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = 0 > select(4, [3], NULL, NULL, {10, 0}) = 0 (Timeout) > ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) = 0 > close(3) = 0 > > On all subsequent runs I get this: > open("/dev/rtc", O_RDONLY) = 3 > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = -1 EINVAL (Invalid argument) > ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) = -1 EINVAL (Invalid argument) > close(3) = 0" > > This was caused by a stupid typo in a patch that should have been > a simple rename to move around contents of a header file, but > accidentally wrote zeroes into the rtc rather than reading from > it. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Fixes: 463a86304cae ("char/genrtc: x86: remove remnants of asm/rtc.h") > --- > arch/x86/kernel/hpet.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > I started seeing system reboots and lockups during kernel boot on a prototype HW this week using v4.8-rc1 and bisected to this same commit. This patch fixes the issue. Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index ed16e58658a4..c6dfd801df97 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -1242,7 +1242,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id) memset(&curr_time, 0, sizeof(struct rtc_time)); if (hpet_rtc_flags & (RTC_UIE | RTC_AIE)) - mc146818_set_time(&curr_time); + mc146818_get_time(&curr_time); if (hpet_rtc_flags & RTC_UIE && curr_time.tm_sec != hpet_prev_update_sec) {
Ville Syrjälä reports "The first time I run hwclock after rebooting I get this: open("/dev/rtc", O_RDONLY) = 3 ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = 0 select(4, [3], NULL, NULL, {10, 0}) = 0 (Timeout) ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) = 0 close(3) = 0 On all subsequent runs I get this: open("/dev/rtc", O_RDONLY) = 3 ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = -1 EINVAL (Invalid argument) ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) = -1 EINVAL (Invalid argument) close(3) = 0" This was caused by a stupid typo in a patch that should have been a simple rename to move around contents of a header file, but accidentally wrote zeroes into the rtc rather than reading from it. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Fixes: 463a86304cae ("char/genrtc: x86: remove remnants of asm/rtc.h") --- arch/x86/kernel/hpet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)