From nobody Thu May 7 21:41:32 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DECFC433EF for ; Tue, 17 May 2022 20:22:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352907AbiEQUWK (ORCPT ); Tue, 17 May 2022 16:22:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346834AbiEQUWG (ORCPT ); Tue, 17 May 2022 16:22:06 -0400 Received: from mx-out.tlen.pl (mx-out.tlen.pl [193.222.135.148]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E347551E6E for ; Tue, 17 May 2022 13:22:04 -0700 (PDT) Received: (wp-smtpd smtp.tlen.pl 25005 invoked from network); 17 May 2022 22:22:01 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1652818921; bh=9ovi1FLOubpAPQv/lsODTtczv1FUcAB21cjp/YOWmuc=; h=From:To:Cc:Subject; b=cPqYGL7HgHwWrg1WcUe9hM7PLyTlZXXLSu5NJECaVtm3CJ+UkBcJiqP9pijmW3e/f VP5v/nUG2ZhpF/oaQiYhoP61pj//b33TQ+a4iOERKbrYl5UBGEZ+zyqA/8BPN0J6BD jfAGoP2WOxeiyHHd3d2ftUB19w+pRP9++Tx+jV4c= Received: from aafg236.neoplus.adsl.tpnet.pl (HELO localhost.localdomain) (mat.jonczyk@o2.pl@[83.4.136.236]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with SMTP for ; 17 May 2022 22:22:01 +0200 From: =?UTF-8?q?Mateusz=20Jo=C5=84czyk?= To: linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Mateusz=20Jo=C5=84czyk?= , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Alessandro Zummo , Alexandre Belloni , Prarit Bhargava Subject: [PATCH v2 resend 1/2] x86/rtc: rewrite mach_get_cmos_time to delete duplicated code Date: Tue, 17 May 2022 22:21:30 +0200 Message-Id: <20220517202131.379939-2-mat.jonczyk@o2.pl> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517202131.379939-1-mat.jonczyk@o2.pl> References: <20220517202131.379939-1-mat.jonczyk@o2.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-WP-MailID: 432265b158737b545904e0712bae5acf X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [cYNx] Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are functions in drivers/rtc/rtc-mc146818-lib.c that handle reading from / writing to the CMOS RTC clock. mach_get_cmos_time() in arch/x86/kernel/rtc.c did not use them and was mostly a duplicate of mc146818_get_time(). Modify mach_get_cmos_time() to use mc146818_get_time() and remove the duplicated code. mach_get_cmos_time() used a different algorithm than mc146818_get_time(), but these functions are equivalent. The major differences were: - mc146818_get_time() is better refined: it was updated in commit 05a0302c3548 ("rtc: mc146818: Prevent reading garbage") to take account of various edge conditions, - when the UIP ("Update in progress") bit of the RTC is set, mach_get_cmos_time() was busy waiting with cpu_relax() while mc146818_get_time() is now using mdelay(1) in every loop iteration, - mach_get_cmos_time() assumed that the RTC year must be >=3D 2000, which may not be true on some old boxes with a dead battery, - mach_get_cmos_time() was holding the rtc_lock for a long time. As a bonus, mach_get_cmos_time() after the modification does not hang indefinitely if the CMOS RTC is not present. The RTC writing counterpart, mach_set_rtc_mmss() is already using mc146818_get_time() from drivers/rtc. This was done in commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") It appears that mach_get_cmos_time() was simply forgotten. mach_get_cmos_time() is really used only in read_persistent_clock64(), which is called only in a few places in kernel/time/timekeeping.c . Signed-off-by: Mateusz Jo=C5=84czyk Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Cc: Alessandro Zummo Cc: Alexandre Belloni Cc: Prarit Bhargava Acked-by: Alexandre Belloni --- v2: - use pr_err() in place of pr_err_ratelimited(). mach_get_cmos_time() is not called frequently, so ratelimiting is not necessary. - tweak commit description. --- arch/x86/kernel/rtc.c | 59 +++++-------------------------------------- 1 file changed, 7 insertions(+), 52 deletions(-) diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 586f718b8e95..1cadc8a15267 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -4,11 +4,8 @@ */ #include #include -#include -#include #include #include -#include =20 #include #include @@ -20,15 +17,12 @@ /* * This is a special lock that is owned by the CPU and holds the index * register we are working with. It is required for NMI access to the - * CMOS/RTC registers. See include/asm-i386/mc146818rtc.h for details. + * CMOS/RTC registers. See arch/x86/include/asm/mc146818rtc.h for details. */ volatile unsigned long cmos_lock; EXPORT_SYMBOL(cmos_lock); #endif /* CONFIG_X86_32 */ =20 -/* For two digit years assume time is always after that */ -#define CMOS_YEARS_OFFS 2000 - DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL(rtc_lock); =20 @@ -62,8 +56,7 @@ int mach_set_rtc_mmss(const struct timespec64 *now) =20 void mach_get_cmos_time(struct timespec64 *now) { - unsigned int status, year, mon, day, hour, min, sec, century =3D 0; - unsigned long flags; + struct rtc_time tm; =20 /* * If pm_trace abused the RTC as storage, set the timespec to 0, @@ -74,51 +67,13 @@ void mach_get_cmos_time(struct timespec64 *now) return; } =20 - spin_lock_irqsave(&rtc_lock, flags); - - /* - * If UIP is clear, then we have >=3D 244 microseconds before - * RTC registers will be updated. Spec sheet says that this - * is the reliable way to read RTC - registers. If UIP is set - * then the register access might be invalid. - */ - while ((CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)) - cpu_relax(); - - sec =3D CMOS_READ(RTC_SECONDS); - min =3D CMOS_READ(RTC_MINUTES); - hour =3D CMOS_READ(RTC_HOURS); - day =3D CMOS_READ(RTC_DAY_OF_MONTH); - mon =3D CMOS_READ(RTC_MONTH); - year =3D CMOS_READ(RTC_YEAR); - -#ifdef CONFIG_ACPI - if (acpi_gbl_FADT.header.revision >=3D FADT2_REVISION_ID && - acpi_gbl_FADT.century) - century =3D CMOS_READ(acpi_gbl_FADT.century); -#endif - - status =3D CMOS_READ(RTC_CONTROL); - WARN_ON_ONCE(RTC_ALWAYS_BCD && (status & RTC_DM_BINARY)); - - spin_unlock_irqrestore(&rtc_lock, flags); - - if (RTC_ALWAYS_BCD || !(status & RTC_DM_BINARY)) { - sec =3D bcd2bin(sec); - min =3D bcd2bin(min); - hour =3D bcd2bin(hour); - day =3D bcd2bin(day); - mon =3D bcd2bin(mon); - year =3D bcd2bin(year); + if (mc146818_get_time(&tm)) { + pr_err("Unable to read current time from RTC\n"); + now->tv_sec =3D now->tv_nsec =3D 0; + return; } =20 - if (century) { - century =3D bcd2bin(century); - year +=3D century * 100; - } else - year +=3D CMOS_YEARS_OFFS; - - now->tv_sec =3D mktime64(year, mon, day, hour, min, sec); + now->tv_sec =3D rtc_tm_to_time64(&tm); now->tv_nsec =3D 0; } =20 --=20 2.25.1 From nobody Thu May 7 21:41:32 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76C30C433F5 for ; Tue, 17 May 2022 20:22:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352938AbiEQUW0 (ORCPT ); Tue, 17 May 2022 16:22:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352903AbiEQUWJ (ORCPT ); Tue, 17 May 2022 16:22:09 -0400 Received: from mx-out.tlen.pl (mx-out.tlen.pl [193.222.135.148]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A72151E6E for ; Tue, 17 May 2022 13:22:07 -0700 (PDT) Received: (wp-smtpd smtp.tlen.pl 26781 invoked from network); 17 May 2022 22:22:04 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1652818924; bh=KT7q9eMAxby7uyk2jYuKh3OvBVpIpHr8zoPO+QpVv2U=; h=From:To:Cc:Subject; b=MqFcUpGC1tSz4iKrU9o7A43ozQ6I+O5TYeYaJ7wCk6ChPs6yzJL7KNquqCSNB1DXQ dq56mIf9YpUFl6DZArNhO4x5rejzK9xqo/Jg+SlLRWYVmAKDO4ScqFYlp3V01cyN+y Kh3SvKjTzgeyU6TpHsLZzdbhZgYInE+1cUxHqAao= Received: from aafg236.neoplus.adsl.tpnet.pl (HELO localhost.localdomain) (mat.jonczyk@o2.pl@[83.4.136.236]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with SMTP for ; 17 May 2022 22:22:04 +0200 From: =?UTF-8?q?Mateusz=20Jo=C5=84czyk?= To: linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Mateusz=20Jo=C5=84czyk?= , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Subject: [PATCH v2 resend 2/2] x86/rtc: rename mach_set_rtc_mmss Date: Tue, 17 May 2022 22:21:31 +0200 Message-Id: <20220517202131.379939-3-mat.jonczyk@o2.pl> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220517202131.379939-1-mat.jonczyk@o2.pl> References: <20220517202131.379939-1-mat.jonczyk@o2.pl> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-WP-MailID: 5861db3696100fcc0889870520856aca X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [USOE] Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Once upon a time, before commit 3195ef59cb42 ("x86: Do full rtc synchronization with ntp") in 2013, the function set only the minute and seconds registers of the CMOS RTC. This is no longer true, so rename the function to mach_set_cmos_time. Signed-off-by: Mateusz Jo=C5=84czyk Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" --- arch/x86/include/asm/mc146818rtc.h | 2 +- arch/x86/kernel/rtc.c | 4 ++-- arch/x86/kernel/x86_init.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc14= 6818rtc.h index 97198001e567..6115bb3d5795 100644 --- a/arch/x86/include/asm/mc146818rtc.h +++ b/arch/x86/include/asm/mc146818rtc.h @@ -95,7 +95,7 @@ static inline unsigned char current_lock_cmos_reg(void) unsigned char rtc_cmos_read(unsigned char addr); void rtc_cmos_write(unsigned char val, unsigned char addr); =20 -extern int mach_set_rtc_mmss(const struct timespec64 *now); +extern int mach_set_cmos_time(const struct timespec64 *now); extern void mach_get_cmos_time(struct timespec64 *now); =20 #define RTC_IRQ 8 diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 1cadc8a15267..349046434513 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c @@ -27,13 +27,13 @@ DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL(rtc_lock); =20 /* - * In order to set the CMOS clock precisely, set_rtc_mmss has to be + * In order to set the CMOS clock precisely, mach_set_cmos_time has to be * called 500 ms after the second nowtime has started, because when * nowtime is written into the registers of the CMOS clock, it will * jump to the next second precisely 500 ms later. Check the Motorola * MC146818A or Dallas DS12887 data sheet for details. */ -int mach_set_rtc_mmss(const struct timespec64 *now) +int mach_set_cmos_time(const struct timespec64 *now) { unsigned long long nowtime =3D now->tv_sec; struct rtc_time tm; diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index e84ee5cdbd8c..57353519bc11 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -138,7 +138,7 @@ struct x86_platform_ops x86_platform __ro_after_init = =3D { .calibrate_cpu =3D native_calibrate_cpu_early, .calibrate_tsc =3D native_calibrate_tsc, .get_wallclock =3D mach_get_cmos_time, - .set_wallclock =3D mach_set_rtc_mmss, + .set_wallclock =3D mach_set_cmos_time, .iommu_shutdown =3D iommu_shutdown_noop, .is_untracked_pat_range =3D is_ISA_range, .nmi_init =3D default_nmi_init, --=20 2.25.1