From 9440986d4e5a7096a1d8f162cd8ae88932c3068d Mon Sep 17 00:00:00 2001 From: Flickdm Date: Mon, 20 May 2024 11:06:42 -0700 Subject: ArmVirtPkg: Move PcdMonitorConduitHvc This moves the PcdMonitorConduitHvc from PcdsFeatureFlag.Common to PcdsFixedAtBuild.Common This is a follow on to the previous commit: ArmPkg: Allow SMC/HVC monitor conduit to be specified at runtime ArmVirtQemu may execute at EL2, in which case monitor calls are generally made using SMC instructions instead of HVC instructions. Whether or not this is the case can only be decided at runtime, and so the associated PCD needs to be settable at runtime, if the platform definition chooses so. This implies a boolean PCD, given that a feature PCD is build-time configurable only. Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sami Mujawar Signed-off-by: Doug Flick [MSFT] Reviewed-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtKvmTool.dsc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ArmVirtPkg') diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 20da331966..ae0dd1497f 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -126,8 +126,6 @@ # Use MMIO for accessing RTC controller registers. gPcAtChipsetPkgTokenSpaceGuid.PcdRtcUseMmio|TRUE - gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE - [PcdsFixedAtBuild.common] gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F @@ -167,6 +165,8 @@ # gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16 + gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE + [PcdsPatchableInModule.common] # # This will be overridden in the code -- cgit v1.2.3