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

ArmVirtPkg/VirtFdtDxe: drop RTC handling 

The RTC driver no longer relies on VirtFdtDxe to set the pl031 RTC base
address in a dynamic PCD, so drop the handling altogether.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ard Biesheuvel 2016-04-08 11:45:05 +02:00
parent 7fba5299eb
commit 0a51462c94
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
View File

@ -42,7 +42,6 @@ typedef struct {
typedef enum { typedef enum {
PropertyTypeUnknown, PropertyTypeUnknown,
PropertyTypeRtc,
PropertyTypeVirtio, PropertyTypeVirtio,
PropertyTypeUart, PropertyTypeUart,
PropertyTypeXen, PropertyTypeXen,
@ -54,7 +53,6 @@ typedef struct {
} PROPERTY; } PROPERTY;
STATIC CONST PROPERTY CompatibleProperties[] = { STATIC CONST PROPERTY CompatibleProperties[] = {
{ PropertyTypeRtc, "arm,pl031" },
{ PropertyTypeVirtio, "virtio,mmio" }, { PropertyTypeVirtio, "virtio,mmio" },
{ PropertyTypeUart, "arm,pl011" }, { PropertyTypeUart, "arm,pl011" },
{ PropertyTypeXen, "xen,xen" }, { PropertyTypeXen, "xen,xen" },
@ -96,7 +94,6 @@ InitializeVirtFdtDxe (
VOID *Hob; VOID *Hob;
VOID *DeviceTreeBase; VOID *DeviceTreeBase;
INT32 Node, Prev; INT32 Node, Prev;
INT32 RtcNode;
EFI_STATUS Status; EFI_STATUS Status;
CONST CHAR8 *Type; CONST CHAR8 *Type;
INT32 Len; INT32 Len;
@ -119,7 +116,6 @@ InitializeVirtFdtDxe (
DEBUG ((EFI_D_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__, DeviceTreeBase)); DEBUG ((EFI_D_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__, DeviceTreeBase));
RtcNode = -1;
// //
// Now enumerate the nodes and install peripherals that we are interested in, // Now enumerate the nodes and install peripherals that we are interested in,
// i.e., GIC, RTC and virtio MMIO nodes // i.e., GIC, RTC and virtio MMIO nodes
@ -196,18 +192,6 @@ InitializeVirtFdtDxe (
} }
break; break;
case PropertyTypeRtc:
ASSERT (Len == 16);
RegBase = fdt64_to_cpu (((UINT64 *)RegProp)[0]);
ASSERT (RegBase < MAX_UINT32);
PcdSet32 (PcdPL031RtcBase, (UINT32)RegBase);
DEBUG ((EFI_D_INFO, "Found PL031 RTC @ 0x%Lx\n", RegBase));
RtcNode = Node;
break;
case PropertyTypeXen: case PropertyTypeXen:
ASSERT (Len == 16); ASSERT (Len == 16);
@ -240,18 +224,7 @@ InitializeVirtFdtDxe (
// //
Status = gBS->InstallConfigurationTable (&gFdtTableGuid, DeviceTreeBase); Status = gBS->InstallConfigurationTable (&gFdtTableGuid, DeviceTreeBase);
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
//
// UEFI takes ownership of the RTC hardware, and exposes its functionality
// through the UEFI Runtime Services GetTime, SetTime, etc. This means we
// need to disable it in the device tree to prevent the OS from attaching its
// device driver as well.
//
if ((RtcNode != -1) &&
fdt_setprop_string (DeviceTreeBase, RtcNode, "status",
"disabled") != 0) {
DEBUG ((EFI_D_WARN, "Failed to set PL031 status to 'disabled'\n"));
}
} }
return EFI_SUCCESS; return EFI_SUCCESS;
} }

3
ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf
View File

@ -49,9 +49,6 @@
gVirtioMmioTransportGuid gVirtioMmioTransportGuid
gFdtHobGuid gFdtHobGuid
[Pcd]
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase
[FeaturePcd] [FeaturePcd]
gArmVirtTokenSpaceGuid.PcdPureAcpiBoot gArmVirtTokenSpaceGuid.PcdPureAcpiBoot