From 83ae7589b08a0d11592527cf45fd1ad8d62118ab Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Tue, 4 Apr 2017 14:20:12 +0100 Subject: ArmVirtPkg/PlatformPeiLib: honor DT node 'status' property In some cases, (e.g., when running QEMU with TrustZone emulation), the DT may contain DT nodes whose status is set to 'secure'. Similarly, the status may be set to 'disabled' if the consumer of the DT image is expected to treat it as if it weren't there. So check whether a 'status' property is present, and if so, ignore the node if the status is not 'okay'. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c index bdf2b57fcb..df52d36533 100644 --- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c +++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c @@ -39,7 +39,9 @@ PlatformPeim ( INT32 Node, Prev; CONST CHAR8 *Compatible; CONST CHAR8 *CompItem; + CONST CHAR8 *NodeStatus; INT32 Len; + INT32 StatusLen; CONST UINT64 *RegProp; UINT64 UartBase; @@ -83,6 +85,11 @@ PlatformPeim ( CompItem += 1 + AsciiStrLen (CompItem)) { if (AsciiStrCmp (CompItem, "arm,pl011") == 0) { + NodeStatus = fdt_getprop (Base, Node, "status", &StatusLen); + if (NodeStatus != NULL && AsciiStrCmp (NodeStatus, "okay") != 0) { + continue; + } + RegProp = fdt_getprop (Base, Node, "reg", &Len); ASSERT (Len == 16); -- cgit v1.2.3