* [PATCH v1] rtc: cmos: Evaluate century appropriate
@ 2022-01-06 8:46 Riwen Lu
2022-01-11 18:07 ` Eric Wong
2022-01-16 22:58 ` Alexandre Belloni
0 siblings, 2 replies; 4+ messages in thread
From: Riwen Lu @ 2022-01-06 8:46 UTC (permalink / raw)
To: a.zummo, alexandre.belloni, e; +Cc: linux-rtc, linux-kernel, Riwen Lu
There's limiting the year to 2069. When setting the rtc year to 2070,
reading it returns 1970. Evaluate century starting from 19 to count the
correct year.
$ sudo date -s 20700106
Mon 06 Jan 2070 12:00:00 AM CST
$ sudo hwclock -w
$ sudo hwclock -r
1970-01-06 12:00:49.604968+08:00
Fixes: 2a4daadd4d3e5071 ("rtc: cmos: ignore bogus century byte")
Signed-off-by: Riwen Lu <luriwen@kylinos.cn>
---
drivers/rtc/rtc-mc146818-lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c
index dcfaf09946ee..2065842f775d 100644
--- a/drivers/rtc/rtc-mc146818-lib.c
+++ b/drivers/rtc/rtc-mc146818-lib.c
@@ -104,7 +104,7 @@ unsigned int mc146818_get_time(struct rtc_time *time)
time->tm_year += real_year - 72;
#endif
- if (century > 20)
+ if (century > 19)
time->tm_year += (century - 19) * 100;
/*
--
2.25.1
No virus found
Checked by Hillstone Network AntiVirus
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v1] rtc: cmos: Evaluate century appropriate
2022-01-06 8:46 [PATCH v1] rtc: cmos: Evaluate century appropriate Riwen Lu
@ 2022-01-11 18:07 ` Eric Wong
2022-01-16 22:58 ` Alexandre Belloni
1 sibling, 0 replies; 4+ messages in thread
From: Eric Wong @ 2022-01-11 18:07 UTC (permalink / raw)
To: Riwen Lu; +Cc: a.zummo, alexandre.belloni, linux-rtc, linux-kernel
Riwen Lu <luriwen@kylinos.cn> wrote:
> There's limiting the year to 2069. When setting the rtc year to 2070,
> reading it returns 1970. Evaluate century starting from 19 to count the
> correct year.
>
> $ sudo date -s 20700106
> Mon 06 Jan 2070 12:00:00 AM CST
> $ sudo hwclock -w
> $ sudo hwclock -r
> 1970-01-06 12:00:49.604968+08:00
>
> Fixes: 2a4daadd4d3e5071 ("rtc: cmos: ignore bogus century byte")
>
> Signed-off-by: Riwen Lu <luriwen@kylinos.cn>
Oops, I'm not good at arithmetic :x Thanks for this fix.
Acked-by: Eric Wong <e@80x24.org>
> index dcfaf09946ee..2065842f775d 100644
> --- a/drivers/rtc/rtc-mc146818-lib.c
> +++ b/drivers/rtc/rtc-mc146818-lib.c
> @@ -104,7 +104,7 @@ unsigned int mc146818_get_time(struct rtc_time *time)
> time->tm_year += real_year - 72;
> #endif
>
> - if (century > 20)
> + if (century > 19)
> time->tm_year += (century - 19) * 100;
>
> /*
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v1] rtc: cmos: Evaluate century appropriate
2022-01-06 8:46 [PATCH v1] rtc: cmos: Evaluate century appropriate Riwen Lu
2022-01-11 18:07 ` Eric Wong
@ 2022-01-16 22:58 ` Alexandre Belloni
1 sibling, 0 replies; 4+ messages in thread
From: Alexandre Belloni @ 2022-01-16 22:58 UTC (permalink / raw)
To: Riwen Lu, a.zummo, e; +Cc: Alexandre Belloni, linux-rtc, linux-kernel
On Thu, 6 Jan 2022 16:46:09 +0800, Riwen Lu wrote:
> There's limiting the year to 2069. When setting the rtc year to 2070,
> reading it returns 1970. Evaluate century starting from 19 to count the
> correct year.
>
> $ sudo date -s 20700106
> Mon 06 Jan 2070 12:00:00 AM CST
> $ sudo hwclock -w
> $ sudo hwclock -r
> 1970-01-06 12:00:49.604968+08:00
>
> [...]
Applied, thanks!
[1/1] rtc: cmos: Evaluate century appropriate
commit: ff164ae39b82ee483b24579c8e22a13a8ce5bd04
Best regards,
--
Alexandre Belloni <alexandre.belloni@bootlin.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <20220106084609.1223688-1-luriwen () kylinos ! cn>]
* Re: [PATCH v1] rtc: cmos: Evaluate century appropriate
[not found] <20220106084609.1223688-1-luriwen () kylinos ! cn>
@ 2022-01-07 12:43 ` Mateusz Jończyk
0 siblings, 0 replies; 4+ messages in thread
From: Mateusz Jończyk @ 2022-01-07 12:43 UTC (permalink / raw)
To: linux-rtc; +Cc: Alessandro Zummo, Alexandre Belloni, luriwen
W dniu 06.01.2022 o 09:46, Riwen Lu pisze:
> There's limiting the year to 2069. When setting the rtc year to 2070,
> reading it returns 1970. Evaluate century starting from 19 to count the
> correct year.
>
> $ sudo date -s 20700106
> Mon 06 Jan 2070 12:00:00 AM CST
> $ sudo hwclock -w
> $ sudo hwclock -r
> 1970-01-06 12:00:49.604968+08:00
Indeed, my system is also affected.
> Fixes: 2a4daadd4d3e5071 ("rtc: cmos: ignore bogus century byte")
>
> Signed-off-by: Riwen Lu <luriwen@kylinos.cn>
Reviewed-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
> drivers/rtc/rtc-mc146818-lib.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/rtc/rtc-mc146818-lib.c b/drivers/rtc/rtc-mc146818-lib.c
> index dcfaf09946ee..2065842f775d 100644
> --- a/drivers/rtc/rtc-mc146818-lib.c
> +++ b/drivers/rtc/rtc-mc146818-lib.c
> @@ -104,7 +104,7 @@ unsigned int mc146818_get_time(struct rtc_time *time)
> time->tm_year += real_year - 72;
> #endif
>
> - if (century > 20)
> + if (century > 19)
> time->tm_year += (century - 19) * 100;
>
> /*
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-01-16 22:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-06 8:46 [PATCH v1] rtc: cmos: Evaluate century appropriate Riwen Lu
2022-01-11 18:07 ` Eric Wong
2022-01-16 22:58 ` Alexandre Belloni
[not found] <20220106084609.1223688-1-luriwen () kylinos ! cn>
2022-01-07 12:43 ` Mateusz Jończyk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).