Skip to contentSkip to conversation

rtc regression [463a86304cae ("char/genrtc: x86: remove remnants of asm/rtc.h")]

DISCUSSION Ville Syrjälä 2 participants 3 messages Aug 9, 2016

Subsystems (3)
x86 Real time clock (RTC) Hpet: x86
lore
Share & tools
lore

Ville Syrjälä

author
#0 lore raw

Hi,

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.

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

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 argument)
ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) =3D -1 EINVAL (Invalid argument)
close(3) =3D 0

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})
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
close(3) =3D 0

--=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 [email protected].
For more options, visit https://groups.google.com/d/optout.

#1 lore raw
Quoted 13 lines · On Tuesday, August 9, 2016 6:56:49 PM CEST Ville Syrj=C3=A4l=C3=A4 wrote:

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
Quoted 13 lines

=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 argument)
ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) =3D -1 EINVAL (Invalid argument)
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})
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 1 line

close(3) =3D 0

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?

Arnd

arch/x86/kernel/hpet.c +0 -0
index ed16e58658a4..c6dfd801df97 100644
@@ -1242,7 +1242,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
 	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);
=20
if (hpet_rtc_flags & RTC_UIE &&
curr_time.tm_sec !=3D hpet_prev_update_sec) {

--=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 [email protected].
For more options, visit https://groups.google.com/d/optout.

author Tested-by
#2 lore raw
Quoted 10 lines · Arnd Bergmann
Quoted 9 lines · On Tuesday, August 9, 2016 6:56:49 PM CEST Ville Syrj=C3=A4l=C3=A4 wrote:

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

Quoted 8 lines
Quoted 8 lines

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 1 line
Quoted 1 line

ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) =3D -1 EINVAL (Invalid argumen=

t)

Quoted 6 lines
Quoted 6 lines

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 2 lines
Quoted 2 lines

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

arch/x86/kernel/hpet.c irqreturn_t hpet_rtc_interrupt(int irq, void *dev_i=

Quoted 13 lines
Quoted 1 line

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
=20

arch/x86/kernel/hpet.c +0 -0
index ed16e58658a4..c6dfd801df97 100644
@@ -1242,7 +1242,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_i=

d)

arch/x86/kernel/hpet.c

Quoted 5 lines
arch/x86/kernel/hpet.c +0 -0
 	memset(&curr_time, 0, sizeof(struct rtc_time));

=20

arch/x86/kernel/hpet.c +1 -1
 	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 <[email protected]>

arch/x86/kernel/hpet.c

Quoted 3 lines

=20

arch/x86/kernel/hpet.c +0 -0
 	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 [email protected].
For more options, visit https://groups.google.com/d/optout.