ArmPkg/ArmPsciResetSystemLib: Made the library only using SMC

Only ArmVirtualizationPkg based platforms are expected to use
the dynamic method to choose between SMC and HVC to invoke PSCI.

Change-Id: I6f2578fb238bdcb6b4f02d0aba358f5ccf6a7434

9 files changed, 186 insertions, 48 deletions

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 314275144..05bc1dcd6 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -231,11 +231,3 @@
   gArmTokenSpaceGuid.PcdGicDistributorBase|0|UINT32|0x0000000C

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0|UINT32|0x0000000D

   gArmTokenSpaceGuid.PcdGicSgiIntId|0|UINT32|0x00000025

-

-  #

-  # ARM PSCI function invocations can be done either through hypervisor

-  # calls (HVC) or secure monitor calls (SMC).

-  # PcdArmPsciMethod == 1 : use HVC

-  # PcdArmPsciMethod == 2 : use SMC

-  #

-  gArmTokenSpaceGuid.PcdArmPsciMethod|0|UINT32|0x00000042

diff --git a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c
index 286d37fb4..df4e113c0 100644
--- a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c
+++ b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c
@@ -1,8 +1,12 @@
 /** @file

   Support ResetSystem Runtime call using PSCI calls

 

+  Note: A similar library is implemented in

+  ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib

+  So similar issues might exist in this implementation too.

+

   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  Copyright (c) 2013, ARM Ltd. All rights reserved.<BR>

+  Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>

   Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>

 

   This program and the accompanying materials

@@ -21,22 +25,9 @@
 #include <Library/DebugLib.h>

 #include <Library/EfiResetSystemLib.h>

 #include <Library/ArmSmcLib.h>

-#include <Library/ArmHvcLib.h>

 

 #include <IndustryStandard/ArmStdSmc.h>

 

-STATIC UINT32 mArmPsciMethod;

-

-RETURN_STATUS

-EFIAPI

-ArmPsciResetSystemLibConstructor (

-  VOID

-  )

-{

-  mArmPsciMethod = PcdGet32 (PcdArmPsciMethod);

-  return RETURN_SUCCESS;

-}

-

 /**

   Resets the entire platform.

 

@@ -58,10 +49,8 @@ LibResetSystem (
   )

 {

   ARM_SMC_ARGS ArmSmcArgs;

-  ARM_HVC_ARGS ArmHvcArgs;

 

   switch (ResetType) {

-

   case EfiResetPlatformSpecific:

     // Map the platform specific reset as reboot

   case EfiResetWarm:

@@ -69,31 +58,17 @@ LibResetSystem (
   case EfiResetCold:

     // Send a PSCI 0.2 SYSTEM_RESET command

     ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;

-    ArmHvcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;

     break;

   case EfiResetShutdown:

     // Send a PSCI 0.2 SYSTEM_OFF command

     ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;

-    ArmHvcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;

     break;

   default:

     ASSERT (FALSE);

     return EFI_UNSUPPORTED;

   }

 

-  switch (mArmPsciMethod) {

-  case 1:

-    ArmCallHvc (&ArmHvcArgs);

-    break;

-

-  case 2:

-    ArmCallSmc (&ArmSmcArgs);

-    break;

-

-  default:

-    DEBUG ((EFI_D_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));

-    return EFI_UNSUPPORTED;

-  }

+  ArmCallSmc (&ArmSmcArgs);

 

   // We should never be here

   DEBUG ((EFI_D_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__));

diff --git a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
index 1a5bb6d10..9cdde1f15 100644
--- a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
+++ b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf
@@ -3,6 +3,7 @@
 #

 # Copyright (c) 2008, Apple Inc. All rights reserved.<BR>

 # Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>

+# Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -21,7 +22,6 @@
   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = EfiResetSystemLib

-  CONSTRUCTOR                    = ArmPsciResetSystemLibConstructor

 

 [Sources]

   ArmPsciResetSystemLib.c

@@ -35,7 +35,3 @@
   DebugLib

   BaseLib

   ArmSmcLib

-  ArmHvcLib

-

-[Pcd]

-  gArmTokenSpaceGuid.PcdArmPsciMethod

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc
index 7929dcfa0..b05f1ec7c 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc
@@ -73,7 +73,7 @@
   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.inf

 

   PlatformPeiLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.inf

-  EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf

+  EfiResetSystemLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf

 

   # ARM PL031 RTC Driver

   RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec
index c07fce94a..b581add02 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec
@@ -43,5 +43,13 @@
   #

   gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0|UINT64|0x00000001

 

-[PcdsDynamic,PcdsFixedAtBuild]

+[PcdsDynamic, PcdsFixedAtBuild]

   gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeBaseAddress|0x0|UINT64|0x00000002

+

+  #

+  # ARM PSCI function invocations can be done either through hypervisor

+  # calls (HVC) or secure monitor calls (SMC).

+  # PcdArmPsciMethod == 1 : use HVC

+  # PcdArmPsciMethod == 2 : use SMC

+  #

+  gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod|0|UINT32|0x00000003

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
index abf419f35..634788368 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
@@ -160,7 +160,7 @@
   ## PL031 RealTimeClock

   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0

 

-  gArmTokenSpaceGuid.PcdArmPsciMethod|0

+  gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod|0

 

 ################################################################################

 #

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.c b/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.c
new file mode 100644
index 000000000..88332f56f
--- /dev/null
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.c
@@ -0,0 +1,125 @@
+/** @file

+  Support ResetSystem Runtime call using PSCI calls

+

+  Note: A similar library is implemented in

+  ArmPkg/Library/ArmPsciResetSystemLib. Similar issues might

+  exist in this implementation too.

+

+  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

+  Copyright (c) 2013, ARM Ltd. All rights reserved.<BR>

+  Copyright (c) 2014, Linaro Ltd. 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

+  http://opensource.org/licenses/bsd-license.php

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+#include <PiDxe.h>

+

+#include <Library/BaseLib.h>

+#include <Library/DebugLib.h>

+#include <Library/EfiResetSystemLib.h>

+#include <Library/ArmSmcLib.h>

+#include <Library/ArmHvcLib.h>

+

+#include <IndustryStandard/ArmStdSmc.h>

+

+STATIC UINT32 mArmPsciMethod;

+

+RETURN_STATUS

+EFIAPI

+ArmPsciResetSystemLibConstructor (

+  VOID

+  )

+{

+  mArmPsciMethod = PcdGet32 (PcdArmPsciMethod);

+  return RETURN_SUCCESS;

+}

+

+/**

+  Resets the entire platform.

+

+  @param  ResetType             The type of reset to perform.

+  @param  ResetStatus           The status code for the reset.

+  @param  DataSize              The size, in bytes, of WatchdogData.

+  @param  ResetData             For a ResetType of EfiResetCold, EfiResetWarm, or

+                                EfiResetShutdown the data buffer starts with a Null-terminated

+                                Unicode string, optionally followed by additional binary data.

+

+**/

+EFI_STATUS

+EFIAPI

+LibResetSystem (

+  IN EFI_RESET_TYPE   ResetType,

+  IN EFI_STATUS       ResetStatus,

+  IN UINTN            DataSize,

+  IN CHAR16           *ResetData OPTIONAL

+  )

+{

+  ARM_SMC_ARGS ArmSmcArgs;

+  ARM_HVC_ARGS ArmHvcArgs;

+

+  switch (ResetType) {

+

+  case EfiResetPlatformSpecific:

+    // Map the platform specific reset as reboot

+  case EfiResetWarm:

+    // Map a warm reset into a cold reset

+  case EfiResetCold:

+    // Send a PSCI 0.2 SYSTEM_RESET command

+    ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;

+    ArmHvcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;

+    break;

+  case EfiResetShutdown:

+    // Send a PSCI 0.2 SYSTEM_OFF command

+    ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;

+    ArmHvcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;

+    break;

+  default:

+    ASSERT (FALSE);

+    return EFI_UNSUPPORTED;

+  }

+

+  switch (mArmPsciMethod) {

+  case 1:

+    ArmCallHvc (&ArmHvcArgs);

+    break;

+

+  case 2:

+    ArmCallSmc (&ArmSmcArgs);

+    break;

+

+  default:

+    DEBUG ((EFI_D_ERROR, "%a: no PSCI method defined\n", __FUNCTION__));

+    return EFI_UNSUPPORTED;

+  }

+

+  // We should never be here

+  DEBUG ((EFI_D_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__));

+  CpuDeadLoop ();

+  return EFI_UNSUPPORTED;

+}

+

+/**

+  Initialize any infrastructure required for LibResetSystem () to function.

+

+  @param  ImageHandle   The firmware allocated handle for the EFI image.

+  @param  SystemTable   A pointer to the EFI System Table.

+

+  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.

+

+**/

+EFI_STATUS

+EFIAPI

+LibInitializeResetSystem (

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

+  )

+{

+  return EFI_SUCCESS;

+}

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf b/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf
new file mode 100644
index 000000000..b63507a33
--- /dev/null
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf
@@ -0,0 +1,42 @@
+#/** @file

+# Reset System lib using PSCI hypervisor or secure monitor calls

+#

+# Copyright (c) 2008, Apple Inc. All rights reserved.<BR>

+# Copyright (c) 2014, Linaro Ltd. 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

+#  http://opensource.org/licenses/bsd-license.php

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+#

+#

+#**/

+

+[Defines]

+  INF_VERSION                    = 0x00010005

+  BASE_NAME                      = ArmVirtualizationPsciResetSystemLib

+  FILE_GUID                      = c81d76ed-66fa-44a3-ac4a-f163120187a9

+  MODULE_TYPE                    = BASE

+  VERSION_STRING                 = 1.0

+  LIBRARY_CLASS                  = EfiResetSystemLib

+  CONSTRUCTOR                    = ArmPsciResetSystemLibConstructor

+

+[Sources]

+  ArmVirtualizationPsciResetSystemLib.c

+

+[Packages]

+  ArmPkg/ArmPkg.dec

+  ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec

+  MdePkg/MdePkg.dec

+  EmbeddedPkg/EmbeddedPkg.dec

+

+[LibraryClasses]

+  DebugLib

+  BaseLib

+  ArmSmcLib

+  ArmHvcLib

+

+[Pcd]

+  gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
index 1f10179f0..1c9dd2058 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
@@ -46,6 +46,7 @@
 

 [Pcd]

   gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeBaseAddress

+  gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod

   gArmTokenSpaceGuid.PcdGicDistributorBase

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase

   gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum

@@ -53,7 +54,6 @@
   gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum

   gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum

   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase

-  gArmTokenSpaceGuid.PcdArmPsciMethod

 

 [Protocols]

   gEfiDevicePathProtocolGuid