From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.802.1589262719442480078 for ; Mon, 11 May 2020 22:51:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: kaix.yau@intel.com) IronPort-SDR: cPSgNT2kp6BATGB3ALBkYRguCmVgm4N4daPs5GhHRs7Xr06Vf4Cq60rFkXCGCUEQtJraZ342sN 9dmegzjrMC9A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2020 22:51:58 -0700 IronPort-SDR: B+/0SqSzdAvH5UNMyfTtJXzYGbyrN0p4ujlbz86kMN18Y+PVevvuKSENXHGjmkOPj0GXpxanFB CWwV0dkwwx1w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,382,1583222400"; d="scan'208";a="280008772" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga002.jf.intel.com with ESMTP; 11 May 2020 22:51:57 -0700 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 11 May 2020 22:51:56 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 11 May 2020 22:51:52 -0700 Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmsx601.amr.corp.intel.com ([10.18.126.81]) with mapi id 15.01.1713.004; Mon, 11 May 2020 22:51:52 -0700 From: "Yau, KaiX" To: "Ni, Ray" , "devel@edk2.groups.io" , "kaiyau@gmail.com" CC: "Jiang, Guomin" , "Gao, Liming" , "Archield, Ralphal" Subject: Re: [edk2-devel] [PATCH] PcAtChipsetPkg: Wrong System YEAR displayed in SETUP Thread-Topic: [edk2-devel] [PATCH] PcAtChipsetPkg: Wrong System YEAR displayed in SETUP Thread-Index: AQHV/mhcwW9QFsxhHkms/DTjASpqC6iNGC0A//+XApCAF8k1AP//i0oQgAC0wYD//4t0kA== Date: Tue, 12 May 2020 05:51:52 +0000 Message-ID: References: <50102ef8b38c0e5287ab4d1cb8fc636213f67299.1584672719.git.kaix.yau@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C51152B@SHSMSX104.ccr.corp.intel.com> <3f6385f623054e24b44a375765246d2f@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C53809A@SHSMSX104.ccr.corp.intel.com> <734D49CCEBEEF84792F5B80ED585239D5C53887A@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5C53887A@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-originating-ip: [10.1.200.100] MIME-Version: 1.0 Return-Path: kaix.yau@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Ray, We cannot use 2020 and 2119 if we don't fix the current logic.=20 If they keep that code, The PCD values have to be "2000 and 2099" (or 1900= and 1999) Any specific reasons why you don't fix the logic? I will need to update th= e HSD with your reason. If we fixed it, we don't need to worry about the PCD values anymore. Regards Kai Yau -----Original Message----- From: Ni, Ray=20 Sent: Tuesday, May 12, 2020 1:41 AM To: Yau, KaiX ; devel@edk2.groups.io; kaiyau@gmail.com Cc: Jiang, Guomin ; Gao, Liming ; Archield, Ralphal Subject: RE: [edk2-devel] [PATCH] PcAtChipsetPkg: Wrong System YEAR displa= yed in SETUP I am ok if you change the PCD default value to [2020, 2119]. Please send out separate patch for the PCD default value change if you wan= t. Thanks, Ray > -----Original Message----- > From: Yau, KaiX > Sent: Tuesday, May 12, 2020 10:02 AM > To: Ni, Ray ; devel@edk2.groups.io; kaiyau@gmail.com > Cc: Jiang, Guomin ; Gao, Liming=20 > ; Archield, Ralphal > Subject: RE: [edk2-devel] [PATCH] PcAtChipsetPkg: Wrong System YEAR=20 > displayed in SETUP >=20 > Hi, >=20 > The current default PCD values has issue with the current logic. >=20 > How do you want to resolve this? > If you decide not to fix the logic, at least we need to change the Min v= alue to 2000 and Max value to 2099. >=20 > If you agreed, you can remove my logic fix (PcRtc.c) from the Gerrit, an= d just keep the PCD changes and check-in the code. >=20 > Regards > Kai Yau >=20 >=20 >=20 >=20 >=20 >=20 >=20 > -----Original Message----- > From: Ni, Ray > Sent: Monday, May 11, 2020 9:52 PM > To: Yau, KaiX ; devel@edk2.groups.io;=20 > kaiyau@gmail.com > Cc: Jiang, Guomin ; Gao, Liming=20 > ; Archield, Ralphal > Subject: RE: [edk2-devel] [PATCH] PcAtChipsetPkg: Wrong System YEAR=20 > displayed in SETUP >=20 > The PCD range (100 years) assumes that: > there is no such a x86 system that can use a bios flashed in year 1998= =20 > and this system will be functional till 2097. Or even it can be function= al till 2097, its bios should be flashed multiple times during the 100 year= s. >=20 > I don't think we need to consider the solution to Y3K because I guess=20 > (90% believe) the RTC hardware will disappear after > 10 years at most. >=20 > Thanks, > Ray >=20 > > -----Original Message----- > > From: Yau, KaiX > > Sent: Monday, April 27, 2020 1:47 PM > > To: Ni, Ray ; devel@edk2.groups.io;=20 > > kaiyau@gmail.com > > Cc: Jiang, Guomin ; Gao, Liming=20 > > ; Archield, Ralphal=20 > > > > Subject: RE: [edk2-devel] [PATCH] PcAtChipsetPkg: Wrong System YEAR=20 > > displayed in SETUP > > > > Hi Ray, > > > > The current logic in PcRtc.c will give us WRONG year. (I explained > > below) If we only change the PCD Min. value to 2000 and Max. value=20 > > to 2099. The current logic will work. But we still > have Y3K bug. > > > > That is why we need to read from Hardware. > > If any reasons you guys doesn't want to read from hardware, at least w= e need to change Min. and Max. value ASAP. > > (you can go ahead to delete the change in PcRtc.c and just submit=20 > > the PCD changes) > > > > Regards > > Kai Yau > > > > > > > > -------------------------------------------------------------------- > > -- > > ------- The root cause is from the following logic (PcRtc.c): > > > > Current Default PcdMinimalValidYear =3D 1998 Current Default=20 > > PcdMaximalValidYear =3D 2097 > > > > If we can set the YEAR to 2099, we will end up getting 1999 instead. = The reason why user have not found this problem > > because Windows does not allow user to set the YEAR to 2099. If we=20 > > make the PcdMaximalValidYear smaller, you can reproduce this issue. > > > > Time->Year =3D CheckAndConvertBcd8ToDecimal8 ((UINT8) Time->Year);= <-- Time->Year =3D 99 > > Century =3D (UINT8) (PcdGet16 (PcdMinimalValidYear) / 100); = <-- Century =3D 19 > > if (Time->Year < PcdGet16 (PcdMinimalValidYear) % 100) { = <-- (99 < 97) =3D FALSE > > Century++; > > } > > Time->Year =3D (UINT16) (Century * 100 + Time->Year); = <-- Time->Year =3D 1999 (19 x 100 + 99). Also 1999 is > > within the RANGE, so it is considered as "VALID" data; however it is w= rong. > > > > Regards > > Kai > > > > > > > > > > > > -----Original Message----- > > From: Ni, Ray > > Sent: Monday, April 27, 2020 12:54 AM > > To: devel@edk2.groups.io; kaiyau@gmail.com > > Cc: Yau, KaiX ; Jiang, Guomin=20 > > ; Gao, Liming > > Subject: RE: [edk2-devel] [PATCH] PcAtChipsetPkg: Wrong System YEAR=20 > > displayed in SETUP > > > > This patch introduces several changes for different purposes. > > At least I can see: > > 1. Default PCD value change > > 2. Consume century value from HW > > > > Can you separate the patches to 2 patches? > > > > > > For the purpose #2, can you explain more background/reason? > > > > The PcdMinimalValidYear/ PcdMaximalValidYear value are chosen that=20 > > when a two-digit year is read from HW, there is no confusion to conver= t to 4-digit year. > > Are you aware of this when you made the patch? > > > > Thanks, > > Ray > > > > > > > -----Original Message----- > > > From: devel@edk2.groups.io On Behalf Of Yau > > > Sent: Friday, March 20, 2020 11:42 AM > > > To: devel@edk2.groups.io > > > Cc: Yau, KaiX > > > Subject: [edk2-devel] [PATCH] PcAtChipsetPkg: Wrong System YEAR=20 > > > displayed in SETUP > > > > > > Function ConvertRtcTimeToEfiTime() will reset to Century 19XX when= =20 > > > 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=20 > > > implementation which follows # PcAt defacto standard. > > > # > > > -# Copyright (c) 2009 - 2019, Intel Corporation. All rights=20 > > > reserved.
> > > +# Copyright (c) 2009 - 2020, Intel Corporation. All rights=20 > > > +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|0x00 > > > 00 > > > 0 > > > 00D > > > + # @Expression 0x80000001 | > > > gPcAtChipsetPkgTokenSpaceGuid.PcdMinimalValidYear >=3D 2000 > > > + > > > gPcAtChipsetPkgTokenSpaceGuid.PcdMinimalValidYear|2000|UINT16|0x00 > > > 00 > > > 0 > > > 00D > > > > > > ## This PCD specifies the maximal valid year in RTC. > > > # @Prompt Maximal valid year in RTC. > > > # @Expression 0x80000001 | > > > gPcAtChipsetPkgTokenSpaceGuid.PcdMaximalValidYear <=20 > > > gPcAtChipsetPkgTokenSpaceGuid.PcdMinimalValidYear + 100 > > > - > > > gPcAtChipsetPkgTokenSpaceGuid.PcdMaximalValidYear|2097|UINT16|0x00 > > > 00 > > > 0 > > > 00E > > > + > > > gPcAtChipsetPkgTokenSpaceGuid.PcdMaximalValidYear|2099|UINT16|0x00 > > > 00 > > > 0 > > > 00E > > > > > > [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=20 > > > reserved.
> > > +Copyright (c) 2006 - 2020, Intel Corporation. All rights=20 > > > +reserved.
> > > Copyright (c) 2017, AMD Inc. All rights reserved.
> > > > > > SPDX-License-Identifier: BSD-2-Clause-Patent @@ -441,8 +441,8 @@=20 > > > 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 !=3D 0) { > > > RtcWrite (Global->CenturyRtcAddress, DecimalToBcd8 ((UINT8)=20 > > > (RtcTime.Year / 100))); > > > + } else { > > > + DEBUG ((EFI_D_INFO, "PcRtc: Century RTC Address is not=20 > > > + found\n")); > > > } > > > > > > ConvertEfiTimeToRtcTime (&RtcTime, RegisterB); @@ -868,6 +870,9= =20 > > > @@ ConvertRtcTimeToEfiTime ( { > > > BOOLEAN IsPM; > > > UINT8 Century; > > > + UINT8 CenturyRtcAddress; > > > + > > > + CenturyRtcAddress =3D GetCenturyRtcAddress (); > > > > > > if ((Time->Hour & 0x80) !=3D 0) { > > > IsPM =3D TRUE; > > > @@ -891,14 +896,12 @@ ConvertRtcTimeToEfiTime ( > > > return EFI_INVALID_PARAMETER; > > > } > > > > > > - // > > > - // For minimal/maximum year range [1970, 2069], > > > - // Century is 19 if RTC year >=3D 70, > > > - // Century is 20 otherwise. > > > - // > > > - Century =3D (UINT8) (PcdGet16 (PcdMinimalValidYear) / 100); > > > - if (Time->Year < PcdGet16 (PcdMinimalValidYear) % 100) { > > > - Century++; > > > + if (CenturyRtcAddress !=3D 0) { > > > + Century =3D CheckAndConvertBcd8ToDecimal8 ((UINT8) (RtcRead > > > (CenturyRtcAddress))); > > > + } else if ((PcdGet16 (PcdMinimalValidYear) / 100) =3D=3D (PcdGet1= 6 > > > (PcdMaximalValidYear) / 100)) { > > > + Century =3D (UINT8)(PcdGet16 (PcdMinimalValidYear) / 100); }= =20 > > > + else { > > > + Century =3D RTC_INIT_CENTURY; > > > } > > > Time->Year =3D (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=20 > > > reserved.
> > > +Copyright (c) 2006 - 2020, Intel Corporation. All rights=20 > > > +reserved.
> > > Copyright (c) 2017, AMD Inc. All rights reserved.
> > > > > > SPDX-License-Identifier: BSD-2-Clause-Patent @@ -62,11 +62,12 @@=20 > > > extern PC_RTC_MODULE_GLOBALS mModuleGlobal; // Date and time=20 > > > initial values. > > > // They are used if the RTC values are invalid during driver=20 > > > initialization // -#define RTC_INIT_SECOND 0 -#define=20 > > > 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 > > > > > > > > >=20