tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-26 23:24:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ArmPkg: Revert "Allow SMC/HVC monitor conduit to be specified at runtime"

Browse Source 
This reverts commit 32460bb5b17b5caec29037a4e9462ca149a190e6, which is
no longer needed as ArmVirtQemu now has its own special implementation
for ArmMonitorLib.

Continuous-integration-options: PatchCheck.ignore-multi-package
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel 2024-06-07 10:23:14 +02:00 committed by mergify[bot]
parent 2c19297e6c
commit 3dcc7b73df
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ArmPkg/ArmPkg.dec
View File

@ -139,6 +139,11 @@
# Define if the GICv3 controller should use the GICv2 legacy # Define if the GICv3 controller should use the GICv2 legacy
gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|FALSE|BOOLEAN|0x00000042 gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|FALSE|BOOLEAN|0x00000042
## Define the conduit to use for monitor calls.
# Default PcdMonitorConduitHvc = FALSE, conduit = SMC
# If PcdMonitorConduitHvc = TRUE, conduit = HVC
gArmTokenSpaceGuid.PcdMonitorConduitHvc|FALSE|BOOLEAN|0x00000047
# Whether to remap all unused memory NX before installing the CPU arch # Whether to remap all unused memory NX before installing the CPU arch
# protocol driver. This is needed on platforms that map all DRAM with RWX # protocol driver. This is needed on platforms that map all DRAM with RWX
# attributes initially, and can be disabled otherwise. # attributes initially, and can be disabled otherwise.
@ -312,11 +317,6 @@
gArmTokenSpaceGuid.PcdSystemBiosRelease|0xFFFF|UINT16|0x30000058 gArmTokenSpaceGuid.PcdSystemBiosRelease|0xFFFF|UINT16|0x30000058
gArmTokenSpaceGuid.PcdEmbeddedControllerFirmwareRelease|0xFFFF|UINT16|0x30000059 gArmTokenSpaceGuid.PcdEmbeddedControllerFirmwareRelease|0xFFFF|UINT16|0x30000059
## Define the conduit to use for monitor calls.
# Default PcdMonitorConduitHvc = FALSE, conduit = SMC
# If PcdMonitorConduitHvc = TRUE, conduit = HVC
gArmTokenSpaceGuid.PcdMonitorConduitHvc|FALSE|BOOLEAN|0x00000047
[PcdsFixedAtBuild.common, PcdsDynamic.common] [PcdsFixedAtBuild.common, PcdsDynamic.common]
# #
# ARM Architectural Timer # ARM Architectural Timer

2
ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.c
View File

@ -26,7 +26,7 @@ ArmMonitorCall (
IN OUT ARM_MONITOR_ARGS *Args IN OUT ARM_MONITOR_ARGS *Args
) )
{ {
if (PcdGetBool (PcdMonitorConduitHvc)) { if (FeaturePcdGet (PcdMonitorConduitHvc)) {
ArmCallHvc ((ARM_HVC_ARGS *)Args); ArmCallHvc ((ARM_HVC_ARGS *)Args);
} else { } else {
ArmCallSmc ((ARM_SMC_ARGS *)Args); ArmCallSmc ((ARM_SMC_ARGS *)Args);

2
ArmVirtPkg/ArmVirt.dsc.inc
View File

@ -289,6 +289,8 @@
gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|TRUE gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|TRUE
gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE
[PcdsFeatureFlag.AARCH64] [PcdsFeatureFlag.AARCH64]
# #
# Activate AcpiSdtProtocol # Activate AcpiSdtProtocol

2
ArmVirtPkg/ArmVirtKvmTool.dsc
View File

@ -165,8 +165,6 @@
# #
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16 gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16
gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE
[PcdsPatchableInModule.common] [PcdsPatchableInModule.common]
# #
# This will be overridden in the code # This will be overridden in the code