tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PcAtChipsetPkg: RTC Runtime unable to get correct IO port by PCD 

RTC runtime is unable to get dynamic PCD value after booting to
OS using runtime services.

Resolution: Cache the dynamic PCD value in RTC driver entry point

Cc: Ray Ni <ray.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
Gua Guo 2023-05-22 10:07:24 +08:00 committed by mergify[bot]
parent 0f8323b44b
commit ba2300f97b
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c
View File

@ -11,9 +11,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include "PcRtc.h" #include "PcRtc.h"
extern UINTN mRtcIndexRegister; extern UINTN mRtcIndexRegister;
extern UINTN mRtcTargetRegister; extern UINTN mRtcTargetRegister;
extern UINT16 mRtcDefaultYear;
extern UINT16 mMinimalValidYear;
extern UINT16 mMaximalValidYear;
// //
// Days of month. // Days of month.
// //
@ -72,10 +74,10 @@ IoRtcRead (
) )
{ {
IoWrite8 ( IoWrite8 (
PcdGet8 (PcdRtcIndexRegister), mRtcIndexRegister,
(UINT8)(Address | (UINT8)(IoRead8 (PcdGet8 (PcdRtcIndexRegister)) & 0x80)) (UINT8)(Address | (UINT8)(IoRead8 (mRtcIndexRegister) & 0x80))
); );
return IoRead8 (PcdGet8 (PcdRtcTargetRegister)); return IoRead8 (mRtcTargetRegister);
} }
/** /**
@ -94,10 +96,10 @@ IoRtcWrite (
) )
{ {
IoWrite8 ( IoWrite8 (
PcdGet8 (PcdRtcIndexRegister), mRtcIndexRegister,
(UINT8)(Address | (UINT8)(IoRead8 (PcdGet8 (PcdRtcIndexRegister)) & 0x80)) (UINT8)(Address | (UINT8)(IoRead8 (mRtcIndexRegister) & 0x80))
); );
IoWrite8 (PcdGet8 (PcdRtcTargetRegister), Data); IoWrite8 (mRtcTargetRegister, Data);
} }
/** /**
@ -317,8 +319,8 @@ PcRtcInit (
Time.Hour = RTC_INIT_HOUR; Time.Hour = RTC_INIT_HOUR;
Time.Day = RTC_INIT_DAY; Time.Day = RTC_INIT_DAY;
Time.Month = RTC_INIT_MONTH; Time.Month = RTC_INIT_MONTH;
Time.Year = MAX (PcdGet16 (PcdRtcDefaultYear), PcdGet16 (PcdMinimalValidYear)); Time.Year = MAX (mRtcDefaultYear, mMinimalValidYear);
Time.Year = MIN (Time.Year, PcdGet16 (PcdMaximalValidYear)); Time.Year = MIN (Time.Year, mMaximalValidYear);
Time.Nanosecond = 0; Time.Nanosecond = 0;
Time.TimeZone = EFI_UNSPECIFIED_TIMEZONE; Time.TimeZone = EFI_UNSPECIFIED_TIMEZONE;
Time.Daylight = 0; Time.Daylight = 0;
@ -358,8 +360,8 @@ PcRtcInit (
Time.Hour = RTC_INIT_HOUR; Time.Hour = RTC_INIT_HOUR;
Time.Day = RTC_INIT_DAY; Time.Day = RTC_INIT_DAY;
Time.Month = RTC_INIT_MONTH; Time.Month = RTC_INIT_MONTH;
Time.Year = MAX (PcdGet16 (PcdRtcDefaultYear), PcdGet16 (PcdMinimalValidYear)); Time.Year = MAX (mRtcDefaultYear, mMinimalValidYear);
Time.Year = MIN (Time.Year, PcdGet16 (PcdMaximalValidYear)); Time.Year = MIN (Time.Year, mMaximalValidYear);
Time.Nanosecond = 0; Time.Nanosecond = 0;
Time.TimeZone = Global->SavedTimeZone; Time.TimeZone = Global->SavedTimeZone;
Time.Daylight = Global->Daylight; Time.Daylight = Global->Daylight;
@ -1031,8 +1033,8 @@ ConvertRtcTimeToEfiTime (
// Century is 19 if RTC year >= 70, // Century is 19 if RTC year >= 70,
// Century is 20 otherwise. // Century is 20 otherwise.
// //
Century = (UINT8)(PcdGet16 (PcdMinimalValidYear) / 100); Century = (UINT8)(mMinimalValidYear / 100);
if (Time->Year < PcdGet16 (PcdMinimalValidYear) % 100) { if (Time->Year < mMinimalValidYear % 100) {
Century++; Century++;
} }
@ -1114,8 +1116,8 @@ RtcTimeFieldsValid (
IN EFI_TIME *Time IN EFI_TIME *Time
) )
{ {
if ((Time->Year < PcdGet16 (PcdMinimalValidYear)) || if ((Time->Year < mMinimalValidYear) ||
(Time->Year > PcdGet16 (PcdMaximalValidYear)) || (Time->Year > mMaximalValidYear) ||
(Time->Month < 1) || (Time->Month < 1) ||
(Time->Month > 12) || (Time->Month > 12) ||
(!DayValid (Time)) || (!DayValid (Time)) ||

14
PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtcEntry.c
View File

@ -16,8 +16,11 @@ EFI_HANDLE mHandle = NULL;
STATIC EFI_EVENT mVirtualAddrChangeEvent; STATIC EFI_EVENT mVirtualAddrChangeEvent;
UINTN mRtcIndexRegister; UINTN mRtcIndexRegister;
UINTN mRtcTargetRegister; UINTN mRtcTargetRegister;
UINT16 mRtcDefaultYear;
UINT16 mMinimalValidYear;
UINT16 mMaximalValidYear;
/** /**
Returns the current time and date information, and the time-keeping capabilities Returns the current time and date information, and the time-keeping capabilities
@ -164,8 +167,15 @@ InitializePcRtc (
if (FeaturePcdGet (PcdRtcUseMmio)) { if (FeaturePcdGet (PcdRtcUseMmio)) {
mRtcIndexRegister = (UINTN)PcdGet64 (PcdRtcIndexRegister64); mRtcIndexRegister = (UINTN)PcdGet64 (PcdRtcIndexRegister64);
mRtcTargetRegister = (UINTN)PcdGet64 (PcdRtcTargetRegister64); mRtcTargetRegister = (UINTN)PcdGet64 (PcdRtcTargetRegister64);
} else {
mRtcIndexRegister = (UINTN)PcdGet8 (PcdRtcIndexRegister);
mRtcTargetRegister = (UINTN)PcdGet8 (PcdRtcTargetRegister);
} }
mRtcDefaultYear = PcdGet16 (PcdRtcDefaultYear);
mMinimalValidYear = PcdGet16 (PcdMinimalValidYear);
mMaximalValidYear = PcdGet16 (PcdMaximalValidYear);
Status = PcRtcInit (&mModuleGlobal); Status = PcRtcInit (&mModuleGlobal);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);