summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ArmPkg/ArmPkg.dec5
-rw-r--r--ArmPkg/Library/BdsLib/AArch64/BdsLinuxLoader.c2
-rw-r--r--ArmPkg/Library/BdsLib/BdsLib.inf4
-rw-r--r--ArmPkg/Library/BdsLib/BdsLinuxFdt.c117
-rw-r--r--ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc4
-rw-r--r--ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc9
6 files changed, 31 insertions, 110 deletions
diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 14f16b8516..3b09a0f9ab 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -65,8 +65,9 @@
# it has been configured by the CPU DXE
gArmTokenSpaceGuid.PcdDebuggerExceptionSupport|FALSE|BOOLEAN|0x00000032
- # Define if the Power State Coordination Interface (PSCI) is supported by the Platform Trusted Firmware
- gArmTokenSpaceGuid.PcdArmPsciSupport|FALSE|BOOLEAN|0x00000033
+ # Define if the spin-table mechanism is used by the secondary cores when booting
+ # Linux (instead of PSCI)
+ gArmTokenSpaceGuid.PcdArmLinuxSpinTable|FALSE|BOOLEAN|0x00000033
[PcdsFixedAtBuild.common]
gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE|BOOLEAN|0x00000006
diff --git a/ArmPkg/Library/BdsLib/AArch64/BdsLinuxLoader.c b/ArmPkg/Library/BdsLib/AArch64/BdsLinuxLoader.c
index af113a1fc5..e094413a53 100644
--- a/ArmPkg/Library/BdsLib/AArch64/BdsLinuxLoader.c
+++ b/ArmPkg/Library/BdsLib/AArch64/BdsLinuxLoader.c
@@ -271,7 +271,7 @@ BdsBootLinuxFdt (
//
// Install secondary core pens if the Power State Coordination Interface is not supported
//
- if (FeaturePcdGet (PcdArmPsciSupport) == FALSE) {
+ if (FeaturePcdGet (PcdArmLinuxSpinTable)) {
// Place Pen at the start of Linux memory. We can then tell Linux to not use this bit of memory
PenBase = LinuxImage - 0x80000;
PenSize = (UINTN)&SecondariesPenEnd - (UINTN)&SecondariesPenStart;
diff --git a/ArmPkg/Library/BdsLib/BdsLib.inf b/ArmPkg/Library/BdsLib/BdsLib.inf
index 6158fba591..4b9f664ea1 100644
--- a/ArmPkg/Library/BdsLib/BdsLib.inf
+++ b/ArmPkg/Library/BdsLib/BdsLib.inf
@@ -73,9 +73,9 @@
gEfiUsbIoProtocolGuid
gEfiLoadedImageProtocolGuid
gEfiSimpleNetworkProtocolGuid
-
+
[FeaturePcd]
- gArmTokenSpaceGuid.PcdArmPsciSupport
+ gArmTokenSpaceGuid.PcdArmLinuxSpinTable
[FixedPcd]
gArmTokenSpaceGuid.PcdSystemMemoryBase
diff --git a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
index 5ca24d7a7d..fb7bd5646e 100644
--- a/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
+++ b/ArmPkg/Library/BdsLib/BdsLinuxFdt.c
@@ -1,6 +1,6 @@
/** @file
*
-* Copyright (c) 2011-2013, ARM Limited. All rights reserved.
+* Copyright (c) 2011-2014, ARM Limited. All rights reserved.
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License
@@ -16,8 +16,6 @@
#include <Library/PcdLib.h>
#include <libfdt.h>
-#include <IndustryStandard/ArmSmc.h>
-
#include "BdsInternal.h"
#include "BdsLinuxLoader.h"
@@ -214,38 +212,6 @@ IsLinuxReservedRegion (
}
}
-
-STATIC
-BOOLEAN
-IsPsciSmcSupported (
- VOID
- )
-{
- BOOLEAN PsciSmcSupported;
- UINTN Rx;
-
- PsciSmcSupported = FALSE;
-
- // Check the SMC response to the Presence SMC
- Rx = ARM_SMC_ID_PRESENCE;
- ArmCallSmc (&Rx);
- if (Rx == 1) {
- // Check the SMC UID
- Rx = ARM_SMC_ID_UID;
- ArmCallSmc (&Rx);
- if (Rx == ARM_TRUSTZONE_UID_4LETTERID) {
- Rx = ARM_SMC_ID_UID + 1;
- ArmCallSmc (&Rx);
- if (Rx == ARM_TRUSTZONE_ARM_UID) {
- PsciSmcSupported = TRUE;
- }
- }
- }
-
- return PsciSmcSupported;
-}
-
-
/**
** Relocate the FDT blob to a more appropriate location for the Linux kernel.
** This function will allocate memory for the relocated FDT blob.
@@ -360,11 +326,9 @@ PrepareFdt (
UINTN DescriptorSize;
UINT32 DescriptorVersion;
UINTN Pages;
- BOOLEAN PsciSmcSupported;
UINTN OriginalFdtSize;
BOOLEAN CpusNodeExist;
UINTN CoreMpId;
- UINTN Smc;
NewFdtBlobAllocation = 0;
@@ -395,17 +359,6 @@ PrepareFdt (
goto FAIL_RELOCATE_FDT;
}
- //
- // Ensure the Power State Coordination Interface (PSCI) SMCs are there if supported
- //
- PsciSmcSupported = FALSE;
- if (FeaturePcdGet (PcdArmPsciSupport) == TRUE) {
- PsciSmcSupported = IsPsciSmcSupported();
- if (PsciSmcSupported == FALSE) {
- DEBUG ((EFI_D_ERROR, "Warning: The Power State Coordination Interface (PSCI) is not supported by your platform Trusted Firmware.\n"));
- }
- }
-
fdt = (VOID*)(UINTN)NewFdtBlobBase;
node = fdt_subnode_offset (fdt, 0, "chosen");
@@ -564,31 +517,29 @@ PrepareFdt (
CoreMpId = cpu_to_fdtn (CoreMpId);
fdt_setprop (fdt, cpu_node, "reg", &CoreMpId, sizeof (CoreMpId));
- if (PsciSmcSupported) {
- fdt_setprop_string (fdt, cpu_node, "enable-method", "psci");
- }
} else {
cpu_node = fdt_subnode_offset(fdt, node, Name);
}
- // If Power State Coordination Interface (PSCI) is not supported then it is expected the secondary
- // cores are spinning waiting for the Operating System to release them
- if ((PsciSmcSupported == FALSE) && (cpu_node >= 0)) {
- // We as the bootloader are responsible for either creating or updating
- // these entries. Do not trust the entries in the DT. We only know about
- // 'spin-table' type. Do not try to update other types if defined.
- Method = fdt_getprop(fdt, cpu_node, "enable-method", &lenp);
- if ( (Method == NULL) || (!AsciiStrCmp((CHAR8 *)Method, "spin-table")) ) {
- fdt_setprop_string(fdt, cpu_node, "enable-method", "spin-table");
- CpuReleaseAddr = cpu_to_fdt64(ArmCoreInfoTable[Index].MailboxSetAddress);
- fdt_setprop(fdt, cpu_node, "cpu-release-addr", &CpuReleaseAddr, sizeof(CpuReleaseAddr));
-
- // If it is not the primary core than the cpu should be disabled
- if (((ArmCoreInfoTable[Index].ClusterId != ClusterId) || (ArmCoreInfoTable[Index].CoreId != CoreId))) {
- fdt_setprop_string(fdt, cpu_node, "status", "disabled");
+ if (cpu_node >= 0) {
+ Method = fdt_getprop (fdt, cpu_node, "enable-method", &lenp);
+ // We only care when 'enable-method' == 'spin-table'. If the enable-method is not defined
+ // or defined as 'psci' then we ignore its properties.
+ if ((Method != NULL) && (AsciiStrCmp ((CHAR8 *)Method, "spin-table") == 0)) {
+ // There are two cases;
+ // - UEFI firmware parked the secondary cores and/or UEFI firmware is aware of the CPU
+ // release addresses (PcdArmLinuxSpinTable == TRUE)
+ // - the parking of the secondary cores has been managed before starting UEFI and/or UEFI
+ // does not anything about the CPU release addresses - in this case we do nothing
+ if (FeaturePcdGet (PcdArmLinuxSpinTable)) {
+ CpuReleaseAddr = cpu_to_fdt64 (ArmCoreInfoTable[Index].MailboxSetAddress);
+ fdt_setprop (fdt, cpu_node, "cpu-release-addr", &CpuReleaseAddr, sizeof(CpuReleaseAddr));
+
+ // If it is not the primary core than the cpu should be disabled
+ if (((ArmCoreInfoTable[Index].ClusterId != ClusterId) || (ArmCoreInfoTable[Index].CoreId != CoreId))) {
+ fdt_setprop_string(fdt, cpu_node, "status", "disabled");
+ }
}
- } else {
- Print(L"Warning: Unsupported enable-method type for CPU[%d] : %a\n", Index, (CHAR8 *)Method);
}
}
}
@@ -596,36 +547,6 @@ PrepareFdt (
}
}
- // If the Power State Coordination Interface is supported then we signal it in the Device Tree
- if (PsciSmcSupported == TRUE) {
- // Before to create it we check if the node is not already defined in the Device Tree
- node = fdt_subnode_offset(fdt, 0, "psci");
- if (node < 0) {
- // The 'psci' node does not exist, create it
- node = fdt_add_subnode(fdt, 0, "psci");
- if (node < 0) {
- DEBUG((EFI_D_ERROR,"Error on creating 'psci' node\n"));
- Status = EFI_INVALID_PARAMETER;
- goto FAIL_COMPLETE_FDT;
- } else {
- fdt_setprop_string (fdt, node, "compatible", "arm,psci");
- fdt_setprop_string (fdt, node, "method", "smc");
-
- Smc = cpu_to_fdtn (ARM_SMC_ARM_CPU_SUSPEND);
- fdt_setprop (fdt, node, "cpu_suspend", &Smc, sizeof (Smc));
-
- Smc = cpu_to_fdtn (ARM_SMC_ARM_CPU_OFF);
- fdt_setprop (fdt, node, "cpu_off", &Smc, sizeof (Smc));
-
- Smc = cpu_to_fdtn (ARM_SMC_ARM_CPU_ON);
- fdt_setprop (fdt, node, "cpu_on", &Smc, sizeof (Smc));
-
- Smc = cpu_to_fdtn (ARM_SMC_ARM_MIGRATE);
- fdt_setprop (fdt, node, "migrate", &Smc, sizeof (Smc));
- }
- }
- }
-
DEBUG_CODE_BEGIN();
//DebugDumpFdt (fdt);
DEBUG_CODE_END();
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
index eebb96bad7..7cc4e27271 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -72,10 +72,6 @@
# It could be set FALSE to save size.
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
- ## FVP platforms support hardware power control
- # Disabled for now as we have a version mismatch.
- gArmTokenSpaceGuid.PcdArmPsciSupport|FALSE
-
[PcdsFixedAtBuild.common]
gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Fixed Virtual Platform"
gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ARM-FVP"
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
index 6b3f5203d6..55fdc59548 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
@@ -60,16 +60,19 @@
################################################################################
[PcdsFeatureFlag.common]
-
!ifdef $(EDK2_SKIP_PEICORE)
gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE
gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE
!endif
-
+
## If TRUE, Graphics Output Protocol will be installed on virtual handle created by ConsplitterDxe.
# It could be set FALSE to save size.
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
-
+
+ # UEFI firmware is responsible to park the secondary cores on this platform.
+ # This PCD ensures the secondary cores are parked into the AArch64 Linux parking protocol.
+ gArmTokenSpaceGuid.PcdArmLinuxSpinTable|TRUE
+
[PcdsFixedAtBuild.common]
gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM Versatile Express"
gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ArmVExpress-RTSM"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 18:17:03 +0000