diff for duplicates of <20160809165510.GY4329@intel.com> diff --git a/a/1.txt b/N1/1.txt index 9ff7c34..1add132 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,51 +1,46 @@ 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: +> On Tuesday, August 9, 2016 6:56:49 PM CEST Ville Syrjälä 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 -> >=20 +> > 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) =3D 3 -> > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) =3D -1 EINVAL (Invalid argumen= -t) -> > ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) =3D -1 EINVAL (Invalid argumen= -t) -> > close(3) =3D 0 -> >=20 +> > 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 +> > > > 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 +> > open("/dev/rtc", O_RDONLY) = 3 +> > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = 0 +> > select(4, [3], NULL, NULL, {10, 0}) = 1 (in [3], left {9, 530998}) +> > ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) = 0 +> > ioctl(3, RTC_RD_TIME, {tm_sec=20, tm_min=17, tm_hour=15, tm_mday=9, tm_mon=7, tm_year=116, ...}) = 0 +> > close(3) = 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? ->=20 +> > Arnd ->=20 +> > 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_i= -d) +> @@ -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); @@ -53,24 +48,12 @@ d) Heh. Pretty obvious once you see it :) Works for me. -Tested-by: Ville Syrj=C3=A4l=C3=A4 <ville.syrjala@linux.intel.com> +Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -> =20 +> > if (hpet_rtc_flags & RTC_UIE && -> curr_time.tm_sec !=3D hpet_prev_update_sec) { +> curr_time.tm_sec != hpet_prev_update_sec) { ---=20 -Ville Syrj=C3=A4l=C3=A4 +-- +Ville Syrjälä 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. diff --git a/a/content_digest b/N1/content_digest index 2cced5c..5e66c64 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020160809155649.GX4329@intel.com\0" "ref\02994351.VXV5yQJT1N@wuerfel\0" "From\0Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>\0" - "Subject\0[rtc-linux] Re: rtc regression [463a86304cae (\"char/genrtc: x86: remove remnants of asm/rtc.h\")]\0" + "Subject\0Re: rtc regression [463a86304cae (\"char/genrtc: x86: remove remnants of asm/rtc.h\")]\0" "Date\0Tue, 9 Aug 2016 19:55:10 +0300\0" "To\0Arnd Bergmann <arnd@arndb.de>\0" "Cc\0Geert Uytterhoeven <geert@linux-m68k.org>" @@ -16,53 +16,48 @@ "\00:1\0" "b\0" "On Tue, Aug 09, 2016 at 06:09:27PM +0200, Arnd Bergmann wrote:\n" - "> On Tuesday, August 9, 2016 6:56:49 PM CEST Ville Syrj=C3=A4l=C3=A4 wrote:\n" + "> On Tuesday, August 9, 2016 6:56:49 PM CEST Ville Syrj\303\244l\303\244 wrote:\n" "> > Hi,\n" - "> >=20\n" + "> > \n" "> > commit 463a86304cae (\"char/genrtc: x86: remove remnants of asm/rtc.h\")\n" "> > broke rtc for me. Neither hwclock or rtcwake work anymore. This is just\n" "> > a very standard x86-64 IVB box, and it was reported that machines in\n" "> > our i915 test farm are having rtc related problems as well.\n" - "> >=20\n" + "> > \n" "> > The first time I run hwclock after rebooting I get this:\n" - "> > open(\"/dev/rtc\", O_RDONLY) =3D 3\n" - "> > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) =3D 0\n" - "> > select(4, [3], NULL, NULL, {10, 0}) =3D 0 (Timeout)\n" - "> > ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) =3D 0\n" - "> > close(3) =3D 0\n" - "> >=20\n" + "> > open(\"/dev/rtc\", O_RDONLY) = 3\n" + "> > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = 0\n" + "> > select(4, [3], NULL, NULL, {10, 0}) = 0 (Timeout)\n" + "> > ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) = 0\n" + "> > close(3) = 0\n" + "> > \n" "> > On all subsequent runs I get this:\n" - "> > open(\"/dev/rtc\", O_RDONLY) =3D 3\n" - "> > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) =3D -1 EINVAL (Invalid argumen=\n" - "t)\n" - "> > ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) =3D -1 EINVAL (Invalid argumen=\n" - "t)\n" - "> > close(3) =3D 0\n" - "> >=20\n" + "> > open(\"/dev/rtc\", O_RDONLY) = 3\n" + "> > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = -1 EINVAL (Invalid argument)\n" + "> > ioctl(3, RTC_RD_TIME, 0x7ffd76b3ae70) = -1 EINVAL (Invalid argument)\n" + "> > close(3) = 0\n" + "> > \n" "> > 463a86304cae^ gets me back to working condition:\n" - "> > open(\"/dev/rtc\", O_RDONLY) =3D 3\n" - "> > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) =3D 0\n" - "> > select(4, [3], NULL, NULL, {10, 0}) =3D 1 (in [3], left {9, 530998=\n" - "})\n" - "> > ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) =3D 0\n" - "> > ioctl(3, RTC_RD_TIME, {tm_sec=3D20, tm_min=3D17, tm_hour=3D15, tm_mday=\n" - "=3D9, tm_mon=3D7, tm_year=3D116, ...}) =3D 0\n" - "> > close(3) =3D 0\n" - ">=20\n" + "> > open(\"/dev/rtc\", O_RDONLY) = 3\n" + "> > ioctl(3, PHN_SET_REGS or RTC_UIE_ON, 0) = 0\n" + "> > select(4, [3], NULL, NULL, {10, 0}) = 1 (in [3], left {9, 530998})\n" + "> > ioctl(3, PHN_NOT_OH or RTC_UIE_OFF, 0) = 0\n" + "> > ioctl(3, RTC_RD_TIME, {tm_sec=20, tm_min=17, tm_hour=15, tm_mday=9, tm_mon=7, tm_year=116, ...}) = 0\n" + "> > close(3) = 0\n" + "> \n" "> That commit was supposed to have no effect on the binary, but it\n" "> seems I had a typo in one file. Can you try this patch on top\n" "> of mainline?\n" - ">=20\n" + "> \n" "> \tArnd\n" - ">=20\n" + "> \n" "> diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c\n" "> index ed16e58658a4..c6dfd801df97 100644\n" "> --- a/arch/x86/kernel/hpet.c\n" "> +++ b/arch/x86/kernel/hpet.c\n" - "> @@ -1242,7 +1242,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_i=\n" - "d)\n" + "> @@ -1242,7 +1242,7 @@ irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)\n" "> \tmemset(&curr_time, 0, sizeof(struct rtc_time));\n" - "> =20\n" + "> \n" "> \tif (hpet_rtc_flags & (RTC_UIE | RTC_AIE))\n" "> -\t\tmc146818_set_time(&curr_time);\n" "> +\t\tmc146818_get_time(&curr_time);\n" @@ -70,26 +65,14 @@ "Heh. Pretty obvious once you see it :)\n" "\n" "Works for me.\n" - "Tested-by: Ville Syrj=C3=A4l=C3=A4 <ville.syrjala@linux.intel.com>\n" + "Tested-by: Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>\n" "\n" - "> =20\n" + "> \n" "> \tif (hpet_rtc_flags & RTC_UIE &&\n" - "> \t curr_time.tm_sec !=3D hpet_prev_update_sec) {\n" + "> \t curr_time.tm_sec != hpet_prev_update_sec) {\n" "\n" - "--=20\n" - "Ville Syrj=C3=A4l=C3=A4\n" - "Intel OTC\n" - "\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "-- \n" + "Ville Syrj\303\244l\303\244\n" + Intel OTC -6f20f9c00bb47ef3288522dcd96ea7dbcf8318567c74d93b26a54d1058316c15 +4807c66c45f16d06908f5b243c2f67a7c161908a57d462df2964b52be8e8172e
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.