diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-09-10 18:49:43 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-09-10 18:49:43 +0000 |
| commit | 259ea52b19b027f2998ee700a9883be9c8f69f61 (patch) | |
| tree | 108b65676b5404f591a2547a21be3672a06886c2 /ArmPlatformPkg/Library | |
| parent | 7a1e861e2925b9c006bcf8f95bd0d720a8c48328 (diff) | |
| download | edk2-259ea52b19b027f2998ee700a9883be9c8f69f61.tar.gz | |
ArmPlatformPkg/PL031RealTimeClockLib: use virtual address of runtime services
This library accesses SystemTable->RuntimeServices at runtime,
which means it should take care to use its updated value after
SetVirtualAddressMap () is called.
Replace references to gRT with mRT, which we initialize to gRT
and update to its virtual value on a virtual address change event.
Contributed-under: TianoCore Contribution Agreement 1.0
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16091 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPlatformPkg/Library')
| -rw-r--r-- | ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c index b43d8dc4b..3e4147c58 100644 --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c @@ -1,8 +1,6 @@ /** @file
Implement EFI RealTimeClock runtime services via RTC Lib.
- Currently this driver does not support runtime virtual calling.
-
Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
@@ -40,11 +38,12 @@ #include <ArmPlatform.h>
-STATIC CONST CHAR16 mTimeZoneVariableName[] = L"PL031RtcTimeZone";
-STATIC CONST CHAR16 mDaylightVariableName[] = L"PL031RtcDaylight";
-STATIC BOOLEAN mPL031Initialized = FALSE;
-STATIC EFI_EVENT mRtcVirtualAddrChangeEvent;
-STATIC UINTN mPL031RtcBase;
+STATIC CONST CHAR16 mTimeZoneVariableName[] = L"PL031RtcTimeZone";
+STATIC CONST CHAR16 mDaylightVariableName[] = L"PL031RtcDaylight";
+STATIC BOOLEAN mPL031Initialized = FALSE;
+STATIC EFI_EVENT mRtcVirtualAddrChangeEvent;
+STATIC UINTN mPL031RtcBase;
+STATIC EFI_RUNTIME_SERVICES *mRT;
EFI_STATUS
IdentifyPL031 (
@@ -294,7 +293,7 @@ LibGetTime ( // Get the current time zone information from non-volatile storage
Size = sizeof (TimeZone);
- Status = gRT->GetVariable (
+ Status = mRT->GetVariable (
(CHAR16 *)mTimeZoneVariableName,
&gEfiCallerIdGuid,
NULL,
@@ -312,7 +311,7 @@ LibGetTime ( // The time zone variable does not exist in non-volatile storage, so create it.
Time->TimeZone = EFI_UNSPECIFIED_TIMEZONE;
// Store it
- Status = gRT->SetVariable (
+ Status = mRT->SetVariable (
(CHAR16 *)mTimeZoneVariableName,
&gEfiCallerIdGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -346,7 +345,7 @@ LibGetTime ( // Get the current daylight information from non-volatile storage
Size = sizeof (Daylight);
- Status = gRT->GetVariable (
+ Status = mRT->GetVariable (
(CHAR16 *)mDaylightVariableName,
&gEfiCallerIdGuid,
NULL,
@@ -364,7 +363,7 @@ LibGetTime ( // The daylight variable does not exist in non-volatile storage, so create it.
Time->Daylight = 0;
// Store it
- Status = gRT->SetVariable (
+ Status = mRT->SetVariable (
(CHAR16 *)mDaylightVariableName,
&gEfiCallerIdGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -498,7 +497,7 @@ LibSetTime ( // Do this after having set the RTC.
// Save the current time zone information into non-volatile storage
- Status = gRT->SetVariable (
+ Status = mRT->SetVariable (
(CHAR16 *)mTimeZoneVariableName,
&gEfiCallerIdGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -516,7 +515,7 @@ LibSetTime ( }
// Save the current daylight information into non-volatile storage
- Status = gRT->SetVariable (
+ Status = mRT->SetVariable (
(CHAR16 *)mDaylightVariableName,
&gEfiCallerIdGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -609,6 +608,7 @@ LibRtcVirtualNotifyEvent ( // runtime calls will be made in virtual mode.
//
EfiConvertPointer (0x0, (VOID**)&mPL031RtcBase);
+ EfiConvertPointer (0x0, (VOID**)&mRT);
return;
}
@@ -656,6 +656,8 @@ LibRtcInitialize ( gRT->GetWakeupTime = LibGetWakeupTime;
gRT->SetWakeupTime = LibSetWakeupTime;
+ mRT = gRT;
+
// Install the protocol
Handle = NULL;
Status = gBS->InstallMultipleProtocolInterfaces (
|