From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752717AbcHIQMI (ORCPT ); Tue, 9 Aug 2016 12:12:08 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:57751 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752265AbcHIQMA convert rfc822-to-8bit (ORCPT ); Tue, 9 Aug 2016 12:12:00 -0400 From: Arnd Bergmann To: Ville =?ISO-8859-1?Q?Syrj=E4l=E4?= Cc: Geert Uytterhoeven , Alexandre Belloni , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Alessandro Zummo , linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com Subject: Re: rtc regression [463a86304cae ("char/genrtc: x86: remove remnants of asm/rtc.h")] Date: Tue, 09 Aug 2016 18:09:27 +0200 Message-ID: <2994351.VXV5yQJT1N@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-31-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <20160809155649.GX4329@intel.com> References: <20160809155649.GX4329@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset="iso-8859-1" X-Provags-ID: V03:K0:5SSnTB5R9O7MenUjlvUK6XnvrSAhBhOK9knr3OE2HZmWxDDLFle RZOtYl22hI4TrLf+OQ5Rh/fxnx6Pn+/uVEK7nI4gOVzceCM/vU4mkKZQlOaPnGLq4L2IRjY 7H3jNa2G3OVU4BYAy+wq/tsgHKmG00ih7H5sPeFWtvO4nY8fqJa//1GBJ9jkQbKoRJUToyG RmcUW0gsKsCLUJVG3+6nQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:fhz2x1LxfIc=:BUO3i+XUqHan7nrwibX8JT 43kSdYw6pSgV8ufNxteIxSFTAsx7jHC48CB1BnK5ddsd8tVBoo3M5OewdvKT4hWWLetbE9JEb beXC4spyQdACsTR3t7PK8d/VWYEdDhE0Wj8tf6Vx03V1PyEX69zhWmT3kUUeV2uCURsW1z137 hAkYIKe5YKSTDLZoLin3431iIDGCj9/dVOl1A2e/+4cy7c7C12i2fhZsaCuOBzxxAAIyFqiw2 tMTugd1YDuKifePncZ7VC0oqcyp7Sg+z2bc0vfi4dPmcT+echQWxz23vUeT/4RBvIm02TKKDe DmKBZqJK/x4A8oP2JL5brwCTPMmzWq6xJK0Boyo29MUYQbDX97IOCtbSFLaO0R13sJjXQi5Q8 Bnas8dnfrxQnpG1gepLNEh7cwjSFpMSFnZQtx/RlDzX+g7C4oI3LkwVTVp1j+lGGWllm34aEt 15zpp+gxh/dIbu1VisGksF5lCMArzE0ZSlrPz9WgVJMHiUU+Gi9lpiZ/PVcpgfboePrVtuQRt /PrQ7d6My4fPHUqkLlPptWptMNm4k+2Kdth9TliFSUS7zzh7jP0RyqvbIEflY6Dy4QIAh3xRY 1QEgEhnVkMgBYSkgRsL6+UIhFJ1jaLkCo1InCdRToiSOQvX9xzHxe7qO944ADAYb4pyvZcF89 bl/jYLBYHgkMXBTlH1P5MhS1jz9/zEDVnUS3nlzl4hVhK38F8yyROFRIsOX+nvkvyLrN5IQY/ Ykas8T5VRsyuQMzr Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tuesday, August 9, 2016 6:56:49 PM CEST Ville Syrjälä wrote: > 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) = 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 > > 463a86304cae^ gets me back to working condition: > 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? Arnd 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) {