From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3897C33CB3 for ; Tue, 28 Jan 2020 14:10:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B176024688 for ; Tue, 28 Jan 2020 14:10:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220610; bh=imP1lVLmVr62EPE8Lw+MwCm/y8htQT19fBkKWTSVtdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HUv/INx0EnDmL+TeC86H3HCFUX3YyuOBUnPEu+c9Y3f47f6rCNc0+WCGN033NGaUy zTepI135zzWSKrdLrgSrkJjKwsCXCdxzg760F6BCEH+G+VZqNCzo5hWRmu+6KAVFr+ YPkoZ1hKkKogQhGLRMgfHhnHC4a0ONWMWbh6JYz4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728144AbgA1OKK (ORCPT ); Tue, 28 Jan 2020 09:10:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:58740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729113AbgA1OKH (ORCPT ); Tue, 28 Jan 2020 09:10:07 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 40DE524685; Tue, 28 Jan 2020 14:10:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220606; bh=imP1lVLmVr62EPE8Lw+MwCm/y8htQT19fBkKWTSVtdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=evAi4hb8CPmWAWcE73Pmdv0Pb5no9tPsK59WxywJijxmPvzQuMGg/I4wq7sU4tDCt IRcm692pXd33D3K1rtzjDxC3A9REFvNAZzRMhxvPk1ywI+CDg3kmHUhOo4nsMZktIW Os8LszGs86efVfuoFYIKpNr/Y4lDfJROVsElk1yE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexandre Belloni , Alessandro Zummo , Sylvain Chouleur , Patrick McDermott , linux-rtc@vger.kernel.org, Eric Wong , Sasha Levin Subject: [PATCH 4.4 037/183] rtc: cmos: ignore bogus century byte Date: Tue, 28 Jan 2020 15:04:16 +0100 Message-Id: <20200128135833.714056908@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Wong [ 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 Cc: Alessandro Zummo Cc: Sylvain Chouleur Cc: Patrick McDermott Cc: linux-rtc@vger.kernel.org Signed-off-by: Eric Wong Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- 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 4e3b6558331ea..3e457ae2d571d 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