[rtc-linux] [PATCH] x86/hpet: fix typo from rtc cleanup

[rtc-linux] [PATCH] x86/hpet: fix typo from rtc cleanup

[Arnd Bergmann]

Ville Syrj=C3=A4l=C3=A4 reports "The first time I run hwclock after rebooti=
ng
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"

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=C3=A4l=C3=A4 <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrj=C3=A4l=C3=A4 <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(-)

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));
=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
2.9.0

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

[PATCH] x86/hpet: fix typo from rtc cleanup

[Arnd Bergmann]

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(-)

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) {
-- 
2.9.0

[rtc-linux] Re: [PATCH] x86/hpet: fix typo from rtc cleanup

[Jarkko Nikula]

Hi

On 08/09/2016 10:54 PM, Arnd Bergmann wrote:
> Ville Syrj=C3=A4l=C3=A4 reports "The first time I run hwclock after reboo=
ting
> 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"
>
> 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=C3=A4l=C3=A4 <ville.syrjala@linux.intel.com>
> Tested-by: Ville Syrj=C3=A4l=C3=A4 <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=20
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>

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

Re: [PATCH] x86/hpet: fix typo from rtc cleanup

[Jarkko Nikula]

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>

[tip:timers/urgent] x86/hpet: Fix /dev/rtc breakage caused by RTC cleanup

[tip-bot for Arnd Bergmann]

Commit-ID:  22cc1ca3c5469cf17e149be232817b9223afa5e4
Gitweb:     http://git.kernel.org/tip/22cc1ca3c5469cf17e149be232817b9223afa5e4
Author:     Arnd Bergmann <arnd@arndb.de>
AuthorDate: Tue, 9 Aug 2016 21:54:53 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 10 Aug 2016 14:37:06 +0200

x86/hpet: Fix /dev/rtc breakage caused by RTC cleanup

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:

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

Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: rtc-linux@googlegroups.com
Fixes: 463a86304cae ("char/genrtc: x86: remove remnants of asm/rtc.h")
Link: http://lkml.kernel.org/r/20160809195528.1604312-1-arnd@arndb.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/hpet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index ed16e58..c6dfd80 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) {