mirror of https://github.com/acidanthera/audk.git
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. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <olivier.martin@arm.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16204 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
3a0e4800a3
commit
9180ab73e6
|
@ -231,11 +231,3 @@
|
||||||
gArmTokenSpaceGuid.PcdGicDistributorBase|0|UINT32|0x0000000C
|
gArmTokenSpaceGuid.PcdGicDistributorBase|0|UINT32|0x0000000C
|
||||||
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0|UINT32|0x0000000D
|
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0|UINT32|0x0000000D
|
||||||
gArmTokenSpaceGuid.PcdGicSgiIntId|0|UINT32|0x00000025
|
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
|
|
||||||
|
|
|
@ -1,8 +1,12 @@
|
||||||
/** @file
|
/** @file
|
||||||
Support ResetSystem Runtime call using PSCI calls
|
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) 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>
|
Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
|
||||||
|
|
||||||
This program and the accompanying materials
|
This program and the accompanying materials
|
||||||
|
@ -21,22 +25,9 @@
|
||||||
#include <Library/DebugLib.h>
|
#include <Library/DebugLib.h>
|
||||||
#include <Library/EfiResetSystemLib.h>
|
#include <Library/EfiResetSystemLib.h>
|
||||||
#include <Library/ArmSmcLib.h>
|
#include <Library/ArmSmcLib.h>
|
||||||
#include <Library/ArmHvcLib.h>
|
|
||||||
|
|
||||||
#include <IndustryStandard/ArmStdSmc.h>
|
#include <IndustryStandard/ArmStdSmc.h>
|
||||||
|
|
||||||
STATIC UINT32 mArmPsciMethod;
|
|
||||||
|
|
||||||
RETURN_STATUS
|
|
||||||
EFIAPI
|
|
||||||
ArmPsciResetSystemLibConstructor (
|
|
||||||
VOID
|
|
||||||
)
|
|
||||||
{
|
|
||||||
mArmPsciMethod = PcdGet32 (PcdArmPsciMethod);
|
|
||||||
return RETURN_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Resets the entire platform.
|
Resets the entire platform.
|
||||||
|
|
||||||
|
@ -58,10 +49,8 @@ LibResetSystem (
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
ARM_SMC_ARGS ArmSmcArgs;
|
ARM_SMC_ARGS ArmSmcArgs;
|
||||||
ARM_HVC_ARGS ArmHvcArgs;
|
|
||||||
|
|
||||||
switch (ResetType) {
|
switch (ResetType) {
|
||||||
|
|
||||||
case EfiResetPlatformSpecific:
|
case EfiResetPlatformSpecific:
|
||||||
// Map the platform specific reset as reboot
|
// Map the platform specific reset as reboot
|
||||||
case EfiResetWarm:
|
case EfiResetWarm:
|
||||||
|
@ -69,31 +58,17 @@ LibResetSystem (
|
||||||
case EfiResetCold:
|
case EfiResetCold:
|
||||||
// Send a PSCI 0.2 SYSTEM_RESET command
|
// Send a PSCI 0.2 SYSTEM_RESET command
|
||||||
ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;
|
ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;
|
||||||
ArmHvcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;
|
|
||||||
break;
|
break;
|
||||||
case EfiResetShutdown:
|
case EfiResetShutdown:
|
||||||
// Send a PSCI 0.2 SYSTEM_OFF command
|
// Send a PSCI 0.2 SYSTEM_OFF command
|
||||||
ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;
|
ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;
|
||||||
ArmHvcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ASSERT (FALSE);
|
ASSERT (FALSE);
|
||||||
return EFI_UNSUPPORTED;
|
return EFI_UNSUPPORTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (mArmPsciMethod) {
|
ArmCallSmc (&ArmSmcArgs);
|
||||||
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
|
// We should never be here
|
||||||
DEBUG ((EFI_D_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__));
|
DEBUG ((EFI_D_ERROR, "%a: PSCI Reset failed\n", __FUNCTION__));
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008, Apple Inc. All rights reserved.<BR>
|
# Copyright (c) 2008, Apple Inc. All rights reserved.<BR>
|
||||||
# Copyright (c) 2014, Linaro Ltd. 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
|
# This program and the accompanying materials
|
||||||
# are licensed and made available under the terms and conditions of the BSD License
|
# are licensed and made available under the terms and conditions of the BSD License
|
||||||
|
@ -21,7 +22,6 @@
|
||||||
MODULE_TYPE = BASE
|
MODULE_TYPE = BASE
|
||||||
VERSION_STRING = 1.0
|
VERSION_STRING = 1.0
|
||||||
LIBRARY_CLASS = EfiResetSystemLib
|
LIBRARY_CLASS = EfiResetSystemLib
|
||||||
CONSTRUCTOR = ArmPsciResetSystemLibConstructor
|
|
||||||
|
|
||||||
[Sources]
|
[Sources]
|
||||||
ArmPsciResetSystemLib.c
|
ArmPsciResetSystemLib.c
|
||||||
|
@ -35,7 +35,3 @@
|
||||||
DebugLib
|
DebugLib
|
||||||
BaseLib
|
BaseLib
|
||||||
ArmSmcLib
|
ArmSmcLib
|
||||||
ArmHvcLib
|
|
||||||
|
|
||||||
[Pcd]
|
|
||||||
gArmTokenSpaceGuid.PcdArmPsciMethod
|
|
||||||
|
|
|
@ -73,7 +73,7 @@
|
||||||
ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.inf
|
ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.inf
|
||||||
|
|
||||||
PlatformPeiLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.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
|
# ARM PL031 RTC Driver
|
||||||
RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
|
RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
|
||||||
|
|
|
@ -43,5 +43,13 @@
|
||||||
#
|
#
|
||||||
gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0|UINT64|0x00000001
|
gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0|UINT64|0x00000001
|
||||||
|
|
||||||
[PcdsDynamic,PcdsFixedAtBuild]
|
[PcdsDynamic, PcdsFixedAtBuild]
|
||||||
gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeBaseAddress|0x0|UINT64|0x00000002
|
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
|
||||||
|
|
|
@ -160,7 +160,7 @@
|
||||||
## PL031 RealTimeClock
|
## PL031 RealTimeClock
|
||||||
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0
|
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0
|
||||||
|
|
||||||
gArmTokenSpaceGuid.PcdArmPsciMethod|0
|
gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod|0
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
#
|
#
|
||||||
|
|
|
@ -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;
|
||||||
|
}
|
|
@ -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
|
|
@ -46,6 +46,7 @@
|
||||||
|
|
||||||
[Pcd]
|
[Pcd]
|
||||||
gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeBaseAddress
|
gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeBaseAddress
|
||||||
|
gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod
|
||||||
gArmTokenSpaceGuid.PcdGicDistributorBase
|
gArmTokenSpaceGuid.PcdGicDistributorBase
|
||||||
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
|
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
|
||||||
gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum
|
gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum
|
||||||
|
@ -53,7 +54,6 @@
|
||||||
gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum
|
gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum
|
||||||
gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum
|
gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum
|
||||||
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase
|
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase
|
||||||
gArmTokenSpaceGuid.PcdArmPsciMethod
|
|
||||||
|
|
||||||
[Protocols]
|
[Protocols]
|
||||||
gEfiDevicePathProtocolGuid
|
gEfiDevicePathProtocolGuid
|
||||||
|
|
Loading…
Reference in New Issue