summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlickdm <douglas.flick@microsoft.com>2024-05-20 11:06:42 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-05-24 15:48:52 +0000
commit9440986d4e5a7096a1d8f162cd8ae88932c3068d (patch)
tree034fd7e7887fd5af1350d3e385e63a36ca53d69a
parent32460bb5b17b5caec29037a4e9462ca149a190e6 (diff)
downloadedk2-9440986d4e5a7096a1d8f162cd8ae88932c3068d.tar.gz
edk2-9440986d4e5a7096a1d8f162cd8ae88932c3068d.tar.bz2
edk2-9440986d4e5a7096a1d8f162cd8ae88932c3068d.zip
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 <quic_llindhol@quicinc.com> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Sami Mujawar <sami.mujawar@arm.com> Signed-off-by: Doug Flick [MSFT] <doug.edk2@gmail.com> Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
-rw-r--r--ArmVirtPkg/ArmVirtKvmTool.dsc4
1 files changed, 2 insertions, 2 deletions
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