From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by mx.groups.io with SMTP id smtpd.web10.5368.1584675752951389451 for ; Thu, 19 Mar 2020 20:42:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Kwys1UvA; spf=pass (domain: gmail.com, ip: 209.85.214.194, mailfrom: kaiyau@gmail.com) Received: by mail-pl1-f194.google.com with SMTP id g6so1949579plt.2 for ; Thu, 19 Mar 2020 20:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lESXoJ/1vD8La3XljF0D+7nU7OtZaKAQCEpfW11ADHY=; b=Kwys1UvAAPjQkRXD/8dZ6HuyE8EjVVvVscHMVK4wCfJymCwmv1YphLgMlXyv0jtCKB TnxkrVHMR/HQ8ZaEW4IBlD3gCb7ghPl6MZKiBx3fETcVNMNuDm/DgaulMTwN18tkL6gr jWe/KvawdbVMpSfHGkNQmmupX6341CX4gbaCoakKpaIa5gwDi0TKbr9Amv3B5XJyeHu/ QP6SeUReekDH/QKYQi8I81PTd2DZh/5wneRbtTVJ3aem9Q7aJVG9IKBo3yrjiZSFJ5W7 g0rDO2oo56Zu8XyRLvD1TZDFybolPVzWcIToBF/ASbisxMIq+0bn26okaIjSBvMuaMC6 nUGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lESXoJ/1vD8La3XljF0D+7nU7OtZaKAQCEpfW11ADHY=; b=LdiWs96Uu1thPPRv7fOWa25gPDQBlL8jJl4uCUM1fG58oZliXhAqE7beOuknKPK3Dr YguqpckAsuq3Vu204+xSP5QKtZ2BbLZMzr78gbpu0N9WPbYbx2oGo/maj35NYV3ZtQLt el8UQ5aorH6F0TOrOy3Mm5AXqO7VD9kPuFsptH3RPWBiDjYPiuekbqQXbcIEpcuEbgec 0IKbr2F8SxPwxIfMmanxSzCdR1JlV+IICiTLqL9jyv17rf9s2/E2zsUrbbgsz6NvUfzc m7BmR5UWr1uZIcFeaDB2xgGzeIr52fnXKZc/v5+7HHNzRXKb3uycNOArz8VfCXzGwp9L YmpA== X-Gm-Message-State: ANhLgQ3n+/4m723hWCm0IkLFI6w7ni5u0Ai+hvMUKSrDd8VYGlurxrs0 2/Xj435WRa6P9sGiLS8g8ijv7grDGGM= X-Google-Smtp-Source: ADFU+vvaPHlrTQv+AXfl6MZa+OmJBvpGxmSBHCobxVLSgGa6Io+Yth2InFkYo88X0zXeZF/BMOhEKg== X-Received: by 2002:a17:90b:288:: with SMTP id az8mr7003791pjb.25.1584675752118; Thu, 19 Mar 2020 20:42:32 -0700 (PDT) Return-Path: Received: from kyaux-MOBL1.amr.corp.intel.com ([192.55.54.42]) by smtp.gmail.com with ESMTPSA id md20sm3064262pjb.15.2020.03.19.20.42.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Mar 2020 20:42:31 -0700 (PDT) From: Yau X-Google-Original-From: Yau To: devel@edk2.groups.io Cc: Yau Subject: [PATCH] PcAtChipsetPkg: Wrong System YEAR displayed in SETUP Date: Thu, 19 Mar 2020 23:42:26 -0400 Message-Id: <50102ef8b38c0e5287ab4d1cb8fc636213f67299.1584672719.git.kaix.yau@intel.com> X-Mailer: git-send-email 2.17.1.windows.2 Function ConvertRtcTimeToEfiTime() will reset to Century 19XX when the year is set larger than the value of PcdMaximalValidYear outside SETUP. Signed-off-by: Yau --- PcAtChipsetPkg/PcAtChipsetPkg.dec | 7 +++--- .../PcatRealTimeClockRuntimeDxe/PcRtc.c | 25 +++++++++++-------- .../PcatRealTimeClockRuntimeDxe/PcRtc.h | 17 +++++++------ 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dec b/PcAtChipsetPkg/PcAtChipsetPkg.dec index 88de5cceea..660cb5d52e 100644 --- a/PcAtChipsetPkg/PcAtChipsetPkg.dec +++ b/PcAtChipsetPkg/PcAtChipsetPkg.dec @@ -4,7 +4,7 @@ # This package is designed to public interfaces and implementation which follows # PcAt defacto standard. # -# Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.
# Copyright (c) 2017, AMD Inc. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -61,12 +61,13 @@ ## This PCD specifies the minimal valid year in RTC. # @Prompt Minimal valid year in RTC. - gPcAtChipsetPkgTokenSpaceGuid.PcdMinimalValidYear|1998|UINT16|0x0000000D + # @Expression 0x80000001 | gPcAtChipsetPkgTokenSpaceGuid.PcdMinimalValidYear >= 2000 + gPcAtChipsetPkgTokenSpaceGuid.PcdMinimalValidYear|2000|UINT16|0x0000000D ## This PCD specifies the maximal valid year in RTC. # @Prompt Maximal valid year in RTC. # @Expression 0x80000001 | gPcAtChipsetPkgTokenSpaceGuid.PcdMaximalValidYear < gPcAtChipsetPkgTokenSpaceGuid.PcdMinimalValidYear + 100 - gPcAtChipsetPkgTokenSpaceGuid.PcdMaximalValidYear|2097|UINT16|0x0000000E + gPcAtChipsetPkgTokenSpaceGuid.PcdMaximalValidYear|2099|UINT16|0x0000000E [PcdsFixedAtBuild, PcdsPatchableInModule] ## Defines the ACPI register set base address. diff --git a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c index 52af179417..38a3521dfc 100644 --- a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c +++ b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c @@ -1,7 +1,7 @@ /** @file RTC Architectural Protocol GUID as defined in DxeCis 0.96. -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -441,8 +441,8 @@ PcRtcGetTime ( **/ EFI_STATUS PcRtcSetTime ( - IN EFI_TIME *Time, - IN PC_RTC_MODULE_GLOBALS *Global + IN EFI_TIME *Time, + IN OUT PC_RTC_MODULE_GLOBALS *Global ) { EFI_STATUS Status; @@ -525,6 +525,8 @@ PcRtcSetTime ( // if (Global->CenturyRtcAddress != 0) { RtcWrite (Global->CenturyRtcAddress, DecimalToBcd8 ((UINT8) (RtcTime.Year / 100))); + } else { + DEBUG ((EFI_D_INFO, "PcRtc: Century RTC Address is not found\n")); } ConvertEfiTimeToRtcTime (&RtcTime, RegisterB); @@ -868,6 +870,9 @@ ConvertRtcTimeToEfiTime ( { BOOLEAN IsPM; UINT8 Century; + UINT8 CenturyRtcAddress; + + CenturyRtcAddress = GetCenturyRtcAddress (); if ((Time->Hour & 0x80) != 0) { IsPM = TRUE; @@ -891,14 +896,12 @@ ConvertRtcTimeToEfiTime ( return EFI_INVALID_PARAMETER; } - // - // For minimal/maximum year range [1970, 2069], - // Century is 19 if RTC year >= 70, - // Century is 20 otherwise. - // - Century = (UINT8) (PcdGet16 (PcdMinimalValidYear) / 100); - if (Time->Year < PcdGet16 (PcdMinimalValidYear) % 100) { - Century++; + if (CenturyRtcAddress != 0) { + Century = CheckAndConvertBcd8ToDecimal8 ((UINT8) (RtcRead (CenturyRtcAddress))); + } else if ((PcdGet16 (PcdMinimalValidYear) / 100) == (PcdGet16 (PcdMaximalValidYear) / 100)) { + Century = (UINT8)(PcdGet16 (PcdMinimalValidYear) / 100); + } else { + Century = RTC_INIT_CENTURY; } Time->Year = (UINT16) (Century * 100 + Time->Year); diff --git a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.h b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.h index 47293ce44c..94926fe73e 100644 --- a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.h +++ b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.h @@ -1,7 +1,7 @@ /** @file Header file for real time clock driver. -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Inc. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -62,11 +62,12 @@ extern PC_RTC_MODULE_GLOBALS mModuleGlobal; // Date and time initial values. // They are used if the RTC values are invalid during driver initialization // -#define RTC_INIT_SECOND 0 -#define RTC_INIT_MINUTE 0 -#define RTC_INIT_HOUR 0 -#define RTC_INIT_DAY 1 -#define RTC_INIT_MONTH 1 +#define RTC_INIT_SECOND 0 +#define RTC_INIT_MINUTE 0 +#define RTC_INIT_HOUR 0 +#define RTC_INIT_DAY 1 +#define RTC_INIT_MONTH 1 +#define RTC_INIT_CENTURY 20 #pragma pack(1) // @@ -160,8 +161,8 @@ PcRtcInit ( **/ EFI_STATUS PcRtcSetTime ( - IN EFI_TIME *Time, - IN PC_RTC_MODULE_GLOBALS *Global + IN EFI_TIME *Time, + IN OUT PC_RTC_MODULE_GLOBALS *Global ); /** -- 2.17.1.windows.2