[rtc-linux] Re: rtc regression [463a86304cae ("char/genrtc: x86: remove remnants of asm/rtc.h")]
flat view
From: Ville Syrjälä <hidden>
Date: 2016-08-09 16:55:18
Also in:
lkml
On Tue, Aug 09, 2016 at 06:09:27PM +0200, Arnd Bergmann wrote:
On Tuesday, August 9, 2016 6:56:49 PM CEST Ville Syrj=C3=A4l=C3=A4 wrote:quoted
Hi, =20 commit 463a86304cae ("char/genrtc: x86: remove remnants of asm/rtc.h") broke rtc for me. Neither hwclock or rtcwake work anymore. This is just a very standard x86-64 IVB box, and it was reported that machines in our i915 test farm are having rtc related problems as well. =20 The first time I run hwclock after rebooting I get this: open("/dev/rtc", O_RDONLY) =3D 3 ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) =3D 0 select(4, [3], NULL, NULL, {10, 0}) =3D 0 (Timeout) ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) =3D 0 close(3) =3D 0 =20 On all subsequent runs I get this: open("/dev/rtc", O_RDONLY) =3D 3 ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) =3D -1 EINVAL (Invalid argumen=
t)
quoted
ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) =3D -1 EINVAL (Invalid argumen=
t)
quoted
close(3) =3D 0 =20 463a86304cae^ gets me back to working condition: open("/dev/rtc", O_RDONLY) =3D 3 ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) =3D 0 select(4, [3], NULL, NULL, {10, 0}) =3D 1 (in [3], left {9, 530998=
})
quoted
ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) =3D 0 ioctl(3, RTC_RD_TIME, {tm_sec=3D20, tm_min=3D17, tm_hour=3D15, tm_mday=
=3D9, tm_mon=3D7, tm_year=3D116, ...}) =3D 0
quoted hunk ↗ jump to hunk
quoted
close(3) =3D 0=20 That commit was supposed to have no effect on the binary, but it seems I had a typo in one file. Can you try this patch on top of mainline? =20 Arnd =20diff --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_i=
d)
memset(&curr_time, 0, sizeof(struct rtc_time)); =20 if (hpet_rtc_flags & (RTC_UIE | RTC_AIE)) - mc146818_set_time(&curr_time); + mc146818_get_time(&curr_time);
Heh. Pretty obvious once you see it :) Works for me. Tested-by: Ville Syrj=C3=A4l=C3=A4 <redacted>
=20
if (hpet_rtc_flags & RTC_UIE &&
curr_time.tm_sec !=3D hpet_prev_update_sec) {--=20 Ville Syrj=C3=A4l=C3=A4 Intel OTC --=20 You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. ---=20 You received this message because you are subscribed to the Google Groups "= rtc-linux" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to rtc-linux+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.