ArmVirtPkg: support Cloud Hypervisor in edk2

Cloud Hypervisor is KVM based VMM and is implemented in rust. Just like
other VMMs it need UEFI support to let ACPI work. That's why
Cloud Hypervisor is introduced here.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>

Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

3 files changed, 624 insertions, 1 deletions

diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
new file mode 100644
index 0000000000..f292ba6079
--- /dev/null
+++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -0,0 +1,364 @@
+#

+#  Copyright (c) 2021, ARM Limited. All rights reserved.

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+#

+#

+

+################################################################################

+#

+# Defines Section - statements that will be processed to create a Makefile.

+#

+################################################################################

+[Defines]

+  PLATFORM_NAME                  = ArmVirtCloudHv

+  PLATFORM_GUID                  = DFFED32B-DFFE-D32B-DFFE-D32BDFFED32B

+  PLATFORM_VERSION               = 0.1

+  DSC_SPECIFICATION              = 0x00010005

+  OUTPUT_DIRECTORY               = Build/ArmVirtCloudHv-$(ARCH)

+  SUPPORTED_ARCHITECTURES        = AARCH64|ARM

+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT

+  SKUID_IDENTIFIER               = DEFAULT

+  FLASH_DEFINITION               = ArmVirtPkg/ArmVirtCloudHv.fdf

+

+  #

+  # Defines for default states.  These can be changed on the command line.

+  # -D FLAG=VALUE

+  #

+  DEFINE TTY_TERMINAL            = FALSE

+  DEFINE SECURE_BOOT_ENABLE      = FALSE

+

+!include ArmVirtPkg/ArmVirt.dsc.inc

+

+[LibraryClasses.common]

+  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

+  ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf

+

+  # Virtio Support

+  VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf

+  VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf

+

+  ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf

+

+  TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf

+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

+  BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

+  PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

+  PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf

+  CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf

+  FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf

+  QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf

+  FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf

+  PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

+  PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf

+  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf

+  PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/ArmVirtPciHostBridgeUtilityLib.inf

+

+  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

+

+!include MdePkg/MdeLibs.dsc.inc

+

+[LibraryClasses.common.PEIM]

+  ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf

+

+[LibraryClasses.common.DXE_DRIVER]

+  ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

+

+[LibraryClasses.common.UEFI_DRIVER]

+  UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf

+

+[BuildOptions]

+!include NetworkPkg/NetworkBuildOptions.dsc.inc

+

+################################################################################

+#

+# Pcd Section - list of all EDK II PCD Entries defined by this Platform

+#

+################################################################################

+

+[PcdsFeatureFlag.common]

+  ## 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

+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE

+

+[PcdsFixedAtBuild.common]

+!if $(ARCH) == AARCH64

+  gArmTokenSpaceGuid.PcdVFPEnabled|1

+!endif

+

+  gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x4007c000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0

+  gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800

+

+  # Rsdp base address in Cloud Hypervisor

+  gArmVirtTokenSpaceGuid.PcdCloudHvAcpiRsdpBaseAddress|0x40200000

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x4000000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x40000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE

+!if $(NETWORK_TLS_ENABLE) == TRUE

+  #

+  # The cumulative and individual VOLATILE variable size limits should be set

+  # high enough for accommodating several and/or large CA certificates.

+  #

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000

+!endif

+

+  # Size of the region used by UEFI in permanent memory (Reserved 64MB)

+  gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

+

+  #

+  # ARM PrimeCell

+  #

+

+  ## PL011 - Serial Terminal

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|38400

+

+  ## Default Terminal Type

+  ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM

+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

+

+  # System Memory Base -- fixed at 0x4000_0000

+  gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000

+

+  # initial location of the device tree blob passed by Cloud Hypervisor -- base of DRAM

+  gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000

+

+  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }

+

+  #

+  # The maximum physical I/O addressability of the processor, set with

+  # BuildCpuHob().

+  #

+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16

+

+  #

+  # Enable the non-executable DXE stack. (This gets set up by DxeIpl)

+  #

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE

+

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot

+  gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04

+  gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy|0x04

+  gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy|0x04

+!endif

+

+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|3

+  gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000

+

+[PcdsFixedAtBuild.AARCH64]

+  # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point,

+  # if the entry point version is >= 3.0. AARCH64 OSes cannot assume the

+  # presence of the 32-bit entry point anyway (because many AARCH64 systems

+  # don't have 32-bit addressable physical RAM), and the additional allocations

+  # below 4 GB needlessly fragment the memory map. So expose the 64-bit entry

+  # point only, for entry point versions >= 3.0.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2

+

+[PcdsDynamicDefault.common]

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

+

+  ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI

+  #  enumeration to complete before installing ACPI tables.

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE

+

+  # System Memory Size -- 1 MB initially, actual size will be fetched from DT

+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x00100000

+

+  gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0

+  gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|0x0

+  gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum|0x0

+  gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum|0x0

+

+  #

+  # ARM General Interrupt Controller

+  #

+  gArmTokenSpaceGuid.PcdGicDistributorBase|0x0

+  gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0

+  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0

+

+  ## PL031 RealTimeClock

+  gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0

+

+  # set PcdPciExpressBaseAddress to MAX_UINT64, which signifies that this

+  # PCD and PcdPciDisableBusEnumeration above have not been assigned yet

+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF

+

+  gArmTokenSpaceGuid.PcdPciIoTranslation|0

+

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0

+

+[PcdsDynamicHii]

+  gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS

+

+################################################################################

+#

+# Components Section - list of all EDK II Modules needed by this Platform

+#

+################################################################################

+[Components.common]

+  #

+  # PEI Phase modules

+  #

+  ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf

+  MdeModulePkg/Core/Pei/PeiMain.inf

+  MdeModulePkg/Universal/PCD/Pei/Pcd.inf {

+    <LibraryClasses>

+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+  }

+  ArmPlatformPkg/PlatformPei/PlatformPeim.inf

+  ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf

+  ArmPkg/Drivers/CpuPei/CpuPei.inf

+

+  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

+

+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf

+  }

+

+  #

+  # DXE

+  #

+  MdeModulePkg/Core/Dxe/DxeMain.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf

+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+  }

+  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {

+    <LibraryClasses>

+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+  }

+

+  #

+  # Architectural Protocols

+  #

+  ArmPkg/Drivers/CpuDxe/CpuDxe.inf

+  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

+  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf

+      # don't use unaligned CopyMem () on the UEFI varstore NOR flash region

+      BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf

+  }

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {

+    <LibraryClasses>

+      NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf

+  }

+  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

+  OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf

+!else

+  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

+!endif

+  MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

+  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

+  MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

+  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf

+  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

+    <LibraryClasses>

+      NULL|ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf

+  }

+  EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

+

+  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

+  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

+  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

+  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

+  MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

+

+  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

+

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

+  ArmPkg/Drivers/TimerDxe/TimerDxe.inf {

+    <LibraryClasses>

+      NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf

+  }

+  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

+

+  #

+  # Status Code Routing

+  #

+  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+

+  #

+  # Platform Driver

+  #

+  ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf

+  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf

+  ArmVirtPkg/HighMemDxe/HighMemDxe.inf

+  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

+  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf

+  OvmfPkg/VirtioNetDxe/VirtioNet.inf

+  OvmfPkg/VirtioRngDxe/VirtioRng.inf

+

+  #

+  # FAT filesystem + GPT/MBR partitioning + UDF filesystem + virtio-fs

+  #

+  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

+  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

+  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

+  FatPkg/EnhancedFatDxe/Fat.inf

+  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

+  OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf

+

+  #

+  # Bds

+  #

+  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf {

+    <LibraryClasses>

+      DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf

+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+  }

+  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf

+  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

+  MdeModulePkg/Logo/LogoDxe.inf

+  MdeModulePkg/Application/UiApp/UiApp.inf {

+    <LibraryClasses>

+      NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf

+      NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf

+  }

+

+  #

+  # SCSI Bus and Disk Driver

+  #

+  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

+  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

+

+  #

+  # PCI support

+  #

+  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {

+    <LibraryClasses>

+      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

+  }

+  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf

+  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {

+    <LibraryClasses>

+      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

+  }

+  OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf

+  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf

+  OvmfPkg/Virtio10Dxe/Virtio10.inf

+

+  #

+  # ACPI Support

+  #

+  ArmVirtPkg/CloudHvPlatformHasAcpiDtDxe/CloudHvHasAcpiDtDxe.inf

+[Components.AARCH64]

+  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf

+  ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpiPlatformDxe.inf {

+    <LibraryClasses>

+      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

+  }

diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf
new file mode 100644
index 0000000000..13fe8061c3
--- /dev/null
+++ b/ArmVirtPkg/ArmVirtCloudHv.fdf
@@ -0,0 +1,258 @@
+#

+#  Copyright (c) 2021, ARM Limited. All rights reserved.

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+#

+

+################################################################################

+#

+# FD Section

+# The [FD] Section is made up of the definition statements and a

+# description of what goes into  the Flash Device Image.  Each FD section

+# defines one flash "device" image.  A flash device image may be one of

+# the following: Removable media bootable image (like a boot floppy

+# image,) an Option ROM image (that would be "flashed" into an add-in

+# card,) a System "Flash"  image (that would be burned into a system's

+# flash) or an Update ("Capsule") image that will be used to update and

+# existing system flash.

+#

+################################################################################

+

+[Defines]

+!if $(FD_SIZE_IN_MB) == 2

+  DEFINE FVMAIN_COMPACT_SIZE  = 0x1ff000

+!endif

+!if $(FD_SIZE_IN_MB) == 3

+  DEFINE FVMAIN_COMPACT_SIZE  = 0x2ff000

+!endif

+

+[FD.CLOUDHV_EFI]

+BaseAddress   = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress  # cloud-hypervisor assigns 0 - 0x8000000 for a BootROM

+Size          = $(FD_SIZE)|gArmTokenSpaceGuid.PcdFdSize         # The size in bytes of the FLASH Device

+ErasePolarity = 1

+

+# This one is tricky, it must be: BlockSize * NumBlocks = Size

+BlockSize     = 0x00001000

+NumBlocks     = $(FD_NUM_BLOCKS)

+

+################################################################################

+#

+# Following are lists of FD Region layout which correspond to the locations of different

+# images within the flash device.

+#

+# Regions must be defined in ascending order and may not overlap.

+#

+# A Layout Region start with a eight digit hex offset (leading "0x" required) followed by

+# the pipe "|" character, followed by the size of the region, also in hex with the leading

+# "0x" characters. Like:

+# Offset|Size

+# PcdOffsetCName|PcdSizeCName

+# RegionType <FV, DATA, or FILE>

+#

+################################################################################

+

+#

+# UEFI has trouble dealing with FVs that reside at physical address 0x0.

+# So instead, put a hardcoded 'jump to 0x1000' at offset 0x0, and put the

+# real FV at offset 0x1000

+#

+0x00000000|0x00001000

+DATA = {

+!if $(ARCH) == AARCH64

+  0x00, 0x04, 0x00, 0x14   # 'b 0x1000' in AArch64 ASM

+!else

+  0xfe, 0x03, 0x00, 0xea   # 'b 0x1000' in AArch32 ASM

+!endif

+}

+

+0x00001000|$(FVMAIN_COMPACT_SIZE)

+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize

+FV = FVMAIN_COMPACT

+

+!include VarStore.fdf.inc

+

+################################################################################

+#

+# FV Section

+#

+# [FV] section is used to define what components or modules are placed within a flash

+# device file.  This section also defines order the components and modules are positioned

+# within the image.  The [FV] section consists of define statements, set statements and

+# module statements.

+#

+################################################################################

+

+[FV.FvMain]

+FvNameGuid         = 2A88A00E-E267-C8BF-0E80-AE1BD504ED90

+BlockSize          = 0x40

+NumBlocks          = 0         # This FV gets compressed so make it just big enough

+FvAlignment        = 16        # FV alignment and FV attributes setting.

+ERASE_POLARITY     = 1

+MEMORY_MAPPED      = TRUE

+STICKY_WRITE       = TRUE

+LOCK_CAP           = TRUE

+LOCK_STATUS        = TRUE

+WRITE_DISABLED_CAP = TRUE

+WRITE_ENABLED_CAP  = TRUE

+WRITE_STATUS       = TRUE

+WRITE_LOCK_CAP     = TRUE

+WRITE_LOCK_STATUS  = TRUE

+READ_DISABLED_CAP  = TRUE

+READ_ENABLED_CAP   = TRUE

+READ_STATUS        = TRUE

+READ_LOCK_CAP      = TRUE

+READ_LOCK_STATUS   = TRUE

+

+  INF MdeModulePkg/Core/Dxe/DxeMain.inf

+  INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

+  INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf

+  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf

+  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf

+

+  #

+  # PI DXE Drivers producing Architectural Protocols (EFI Services)

+  #

+  INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf

+  INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

+  INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

+  INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

+  INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

+!if $(SECURE_BOOT_ENABLE) == TRUE

+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

+!endif

+  INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

+  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf

+  INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

+

+  #

+  # Multiple Console IO support

+  #

+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

+  INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

+  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

+

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf

+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

+

+  #

+  # FAT filesystem + GPT/MBR partitioning + UDF filesystem + virtio-fs

+  #

+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

+  INF FatPkg/EnhancedFatDxe/Fat.inf

+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

+  INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

+  INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf

+

+  #

+  # Status Code Routing

+  #

+  INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

+

+  #

+  # Platform Driver

+  #

+  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

+  INF OvmfPkg/VirtioNetDxe/VirtioNet.inf

+  INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf

+  INF OvmfPkg/VirtioRngDxe/VirtioRng.inf

+

+  #

+  # UEFI application (Shell Embedded Boot Loader)

+  #

+  INF ShellPkg/Application/Shell/Shell.inf

+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

+  INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf

+  INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

+

+  #

+  # Bds

+  #

+  INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

+  INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

+  INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

+  INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf

+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

+  INF MdeModulePkg/Application/UiApp/UiApp.inf

+

+  #

+  # SCSI Bus and Disk Driver

+  #

+  INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

+  INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

+

+  #

+  # ACPI Support

+  #

+  INF ArmVirtPkg/CloudHvPlatformHasAcpiDtDxe/CloudHvHasAcpiDtDxe.inf

+!if $(ARCH) == AARCH64

+  INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

+  INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf

+  INF ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpiPlatformDxe.inf

+

+  #

+  # EBC support

+  #

+  INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

+!endif

+

+  #

+  # PCI support

+  #

+  INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf

+  INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf

+  INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

+  INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf

+  INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf

+  INF OvmfPkg/Virtio10Dxe/Virtio10.inf

+

+  #

+  # TianoCore logo (splash screen)

+  #

+  INF MdeModulePkg/Logo/LogoDxe.inf

+

+  #

+  # Ramdisk support

+  #

+  INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf

+

+[FV.FVMAIN_COMPACT]

+FvAlignment        = 16

+ERASE_POLARITY     = 1

+MEMORY_MAPPED      = TRUE

+STICKY_WRITE       = TRUE

+LOCK_CAP           = TRUE

+LOCK_STATUS        = TRUE

+WRITE_DISABLED_CAP = TRUE

+WRITE_ENABLED_CAP  = TRUE

+WRITE_STATUS       = TRUE

+WRITE_LOCK_CAP     = TRUE

+WRITE_LOCK_STATUS  = TRUE

+READ_DISABLED_CAP  = TRUE

+READ_ENABLED_CAP   = TRUE

+READ_STATUS        = TRUE

+READ_LOCK_CAP      = TRUE

+READ_LOCK_STATUS   = TRUE

+

+  INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf

+  INF MdeModulePkg/Core/Pei/PeiMain.inf

+  INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf

+  INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf

+  INF ArmPkg/Drivers/CpuPei/CpuPei.inf

+  INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf

+  INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

+  INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

+

+  FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {

+    SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {

+      SECTION FV_IMAGE = FVMAIN

+    }

+  }

+

+!include ArmVirtRules.fdf.inc

diff --git a/ArmVirtPkg/ArmVirtPkg.ci.yaml b/ArmVirtPkg/ArmVirtPkg.ci.yaml
index 5f427e5723..f80500ab53 100644
--- a/ArmVirtPkg/ArmVirtPkg.ci.yaml
+++ b/ArmVirtPkg/ArmVirtPkg.ci.yaml
@@ -115,7 +115,8 @@
             "virt's",

             "werror",

             "xenio",

-            "kvmtool"

+            "kvmtool",

+            "cloudhv"

         ],           # words to extend to the dictionary for this package

         "IgnoreStandardPaths": [],   # Standard Plugin defined paths that should be ignore

         "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)