[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200116174251.24326-35-sashal@kernel.org>
Date: Thu, 16 Jan 2020 12:40:32 -0500
From: Sasha Levin <sashal@...nel.org>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: Eric Wong <e@...24.org>,
Alexandre Belloni <alexandre.belloni@...tlin.com>,
Alessandro Zummo <a.zummo@...ertech.it>,
Sylvain Chouleur <sylvain.chouleur@...el.com>,
Patrick McDermott <patrick.mcdermott@...iquity.com>,
linux-rtc@...r.kernel.org, Sasha Levin <sashal@...nel.org>,
linux-arch@...r.kernel.org
Subject: [PATCH AUTOSEL 4.4 035/174] rtc: cmos: ignore bogus century byte
From: Eric Wong <e@...24.org>
[ Upstream commit 2a4daadd4d3e507138f8937926e6a4df49c6bfdc ]
Older versions of Libreboot and Coreboot had an invalid value
(`3' in my case) in the century byte affecting the GM45 in
the Thinkpad X200. Not everybody's updated their firmwares,
and Linux <= 4.2 was able to read the RTC without problems,
so workaround this by ignoring invalid values.
Fixes: 3c217e51d8a272b9 ("rtc: cmos: century support")
Cc: Alexandre Belloni <alexandre.belloni@...tlin.com>
Cc: Alessandro Zummo <a.zummo@...ertech.it>
Cc: Sylvain Chouleur <sylvain.chouleur@...el.com>
Cc: Patrick McDermott <patrick.mcdermott@...iquity.com>
Cc: linux-rtc@...r.kernel.org
Signed-off-by: Eric Wong <e@...24.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@...tlin.com>
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
include/asm-generic/rtc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h
index 4e3b6558331e..3e457ae2d571 100644
--- a/include/asm-generic/rtc.h
+++ b/include/asm-generic/rtc.h
@@ -106,7 +106,7 @@ static inline unsigned int __get_rtc_time(struct rtc_time *time)
time->tm_year += real_year - 72;
#endif
- if (century)
+ if (century > 20)
time->tm_year += (century - 19) * 100;
/*
--
2.20.1
Powered by blists - more mailing lists