ArmVirtPkg/VirtFdtDxe: drop detection of PSCI method

[mirror_edk2.git] / ArmVirtPkg / VirtFdtDxe / VirtFdtDxe.c

diff --git a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
index 0e308497e79e6b5a2d44cb42eccec51f31312a87..4a4713cf6ad8001e399738a3d60ff14fbf24f69c 100644 (file)
--- a/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
+++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c
@@ -46,7 +46,6 @@ typedef enum {
   PropertyTypeVirtio,\r
   PropertyTypeUart,\r
   PropertyTypeTimer,\r
-  PropertyTypePsci,\r
   PropertyTypeFwCfg,\r
   PropertyTypePciHost,\r
   PropertyTypeXen,\r
@@ -63,7 +62,6 @@ STATIC CONST PROPERTY CompatibleProperties[] = {
   { PropertyTypeUart,    "arm,pl011"             },\r
   { PropertyTypeTimer,   "arm,armv7-timer"       },\r
   { PropertyTypeTimer,   "arm,armv8-timer"       },\r
-  { PropertyTypePsci,    "arm,psci-0.2"          },\r
   { PropertyTypeFwCfg,   "qemu,fw-cfg-mmio"      },\r
   { PropertyTypePciHost, "pci-host-ecam-generic" },\r
   { PropertyTypeXen,     "xen,xen"               },\r
@@ -292,7 +290,6 @@ InitializeVirtFdtDxe (
   UINT64                         RegBase;\r
   CONST INTERRUPT_PROPERTY       *InterruptProp;\r
   INT32                          SecIntrNum, IntrNum, VirtIntrNum, HypIntrNum;\r
-  CONST CHAR8                    *PsciMethod;\r
   UINT64                         FwCfgSelectorAddress;\r
   UINT64                         FwCfgSelectorSize;\r
   UINT64                         FwCfgDataAddress;\r
@@ -342,8 +339,7 @@ InitializeVirtFdtDxe (
     // TODO use #cells root properties instead\r
     //\r
     RegProp = fdt_getprop (DeviceTreeBase, Node, "reg", &Len);\r
-    ASSERT ((RegProp != NULL) || (PropType == PropertyTypeTimer) ||\r
-      (PropType == PropertyTypePsci));\r
+    ASSERT ((RegProp != NULL) || (PropType == PropertyTypeTimer));\r
 \r
     switch (PropType) {\r
     case PropertyTypePciHost:\r
@@ -479,19 +475,6 @@ InitializeVirtFdtDxe (
       PcdSet32 (PcdArmArchTimerHypIntrNum, HypIntrNum);\r
       break;\r
 \r
-    case PropertyTypePsci:\r
-      PsciMethod = fdt_getprop (DeviceTreeBase, Node, "method", &Len);\r
-\r
-      if (PsciMethod && AsciiStrnCmp (PsciMethod, "hvc", 3) == 0) {\r
-        PcdSet32 (PcdArmPsciMethod, 1);\r
-      } else if (PsciMethod && AsciiStrnCmp (PsciMethod, "smc", 3) == 0) {\r
-        PcdSet32 (PcdArmPsciMethod, 2);\r
-      } else {\r
-        DEBUG ((EFI_D_ERROR, "%a: Unknown PSCI method \"%a\"\n", __FUNCTION__,\r
-          PsciMethod));\r
-      }\r
-      break;\r
-\r
     case PropertyTypeXen:\r
       ASSERT (Len == 16);\r
 \r