Revision: 15348
http://sourceforge.net/p/edk2/code/15348
Author: vanjeff
Date: 2014-03-20 03:25:45 +0000 (Thu, 20 Mar 2014)
Log Message:
-----------
Sync patch r15338 from main trunk.
Did proper error handling when SetVariable failed, and put RTC write operation
at the behind of SetVariable, if SetVariable failed, RTC content could not be
changed.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/15338
Modified Paths:
--------------
branches/UDK2010.SR1/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c
Modified:
branches/UDK2010.SR1/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c
===================================================================
--- branches/UDK2010.SR1/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c
2014-03-20 03:21:39 UTC (rev 15347)
+++ branches/UDK2010.SR1/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.c
2014-03-20 03:25:45 UTC (rev 15348)
@@ -1,7 +1,7 @@
/** @file
RTC Architectural Protocol GUID as defined in DxeCis 0.96.
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -392,7 +392,27 @@
}
return Status;
}
+
//
+ // Write timezone and daylight to RTC variable
+ //
+ TimerVar = Time->Daylight;
+ TimerVar = (UINT32) ((TimerVar << 16) | (UINT16)(Time->TimeZone));
+ Status = EfiSetVariable (
+ L"RTC",
+ &gEfiCallerIdGuid,
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS |
EFI_VARIABLE_NON_VOLATILE,
+ sizeof (TimerVar),
+ &TimerVar
+ );
+ if (EFI_ERROR (Status)) {
+ if (!EfiAtRuntime ()) {
+ EfiReleaseLock (&Global->RtcLock);
+ }
+ return EFI_DEVICE_ERROR;
+ }
+
+ //
// Read Register B, and inhibit updates of the RTC
//
RegisterB.Data = RtcRead (RTC_ADDRESS_REGISTER_B);
@@ -427,17 +447,6 @@
Global->SavedTimeZone = Time->TimeZone;
Global->Daylight = Time->Daylight;
- TimerVar = Time->Daylight;
- TimerVar = (UINT32) ((TimerVar << 16) | (UINT16)(Time->TimeZone));
- Status = EfiSetVariable (
- L"RTC",
- &gEfiCallerIdGuid,
- EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS |
EFI_VARIABLE_NON_VOLATILE,
- sizeof (TimerVar),
- &TimerVar
- );
- ASSERT_EFI_ERROR (Status);
-
return EFI_SUCCESS;
}
@@ -635,27 +644,13 @@
return EFI_DEVICE_ERROR;
}
//
- // Read Register B, and inhibit updates of the RTC
+ // Read Register B
//
- RegisterB.Data = RtcRead (RTC_ADDRESS_REGISTER_B);
+ RegisterB.Data = RtcRead (RTC_ADDRESS_REGISTER_B);
- RegisterB.Bits.Set = 1;
- RtcWrite (RTC_ADDRESS_REGISTER_B, RegisterB.Data);
-
if (Enable) {
ConvertEfiTimeToRtcTime (&RtcTime, RegisterB, &Century);
-
- //
- // Set RTC alarm time
- //
- RtcWrite (RTC_ADDRESS_SECONDS_ALARM, RtcTime.Second);
- RtcWrite (RTC_ADDRESS_MINUTES_ALARM, RtcTime.Minute);
- RtcWrite (RTC_ADDRESS_HOURS_ALARM, RtcTime.Hour);
-
- RegisterB.Bits.Aie = 1;
-
} else {
- RegisterB.Bits.Aie = 0;
//
// if the alarm is disable, record the current setting.
//
@@ -668,11 +663,6 @@
RtcTime.TimeZone = Global->SavedTimeZone;
RtcTime.Daylight = Global->Daylight;
}
- //
- // Allow updates of the RTC registers
- //
- RegisterB.Bits.Set = 0;
- RtcWrite (RTC_ADDRESS_REGISTER_B, RegisterB.Data);
//
// Set the Y/M/D info to variable as it has no corresponding hw registers.
@@ -685,10 +675,38 @@
&RtcTime
);
if (EFI_ERROR (Status)) {
+ if (!EfiAtRuntime ()) {
+ EfiReleaseLock (&Global->RtcLock);
+ }
return EFI_DEVICE_ERROR;
}
+
+ //
+ // Inhibit updates of the RTC
+ //
+ RegisterB.Bits.Set = 1;
+ RtcWrite (RTC_ADDRESS_REGISTER_B, RegisterB.Data);
+ if (Enable) {
+ //
+ // Set RTC alarm time
+ //
+ RtcWrite (RTC_ADDRESS_SECONDS_ALARM, RtcTime.Second);
+ RtcWrite (RTC_ADDRESS_MINUTES_ALARM, RtcTime.Minute);
+ RtcWrite (RTC_ADDRESS_HOURS_ALARM, RtcTime.Hour);
+
+ RegisterB.Bits.Aie = 1;
+
+ } else {
+ RegisterB.Bits.Aie = 0;
+ }
//
+ // Allow updates of the RTC registers
+ //
+ RegisterB.Bits.Set = 0;
+ RtcWrite (RTC_ADDRESS_REGISTER_B, RegisterB.Data);
+
+ //
// Release RTC Lock.
//
if (!EfiAtRuntime ()) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
