From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.9163.1589450208426170211 for ; Thu, 14 May 2020 02:56:48 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ard.biesheuvel@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1F57D31B; Thu, 14 May 2020 02:56:48 -0700 (PDT) Received: from [192.168.1.81] (unknown [10.37.8.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 674A13F305; Thu, 14 May 2020 02:56:43 -0700 (PDT) Subject: Re: [PATCH v2 09/11] ArmVirtPkg: Support for kvmtool emulated platform To: Sami Mujawar , devel@edk2.groups.io Cc: leif@nuviainc.com, lersek@redhat.com, Alexandru.Elisei@arm.com, Andre.Przywara@arm.com, Matteo.Carlini@arm.com, Laura.Moretta@arm.com, nd@arm.com References: <20200514084019.71368-1-sami.mujawar@arm.com> <20200514084019.71368-10-sami.mujawar@arm.com> From: "Ard Biesheuvel" Message-ID: <9b0f1d51-ba1d-eb31-730d-82aa5216beaa@arm.com> Date: Thu, 14 May 2020 11:56:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200514084019.71368-10-sami.mujawar@arm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 5/14/20 10:40 AM, Sami Mujawar wrote: > Kvmtool is a virtual machine manager that enables hosting > KVM guests. Kvmtool emulates certain devices like serial > port, RTC, etc. essentially providing an emulated platform. > > This patch adds support for kvmtool emulated platform. > Please use accurate terminology here. Unlike QEMU, kvmtool is *not* an emulator. It only supports running under KVM, where instructions are executed on the actual CPU, or decoded by the hypervisor for MMIO emulation. > Following is a brief description of the firmware > implementation choices: > > - Serial Port: 16550 UART > On some platforms the 16550 UART is interfaced using > PCI. Therefore, the 16550 Serial port library is > dependent on the PCI library. The 16550 UART driver > checks the Device ID represented using the PCD > gEfiMdeModulePkgTokenSpaceGuid.PcdSerialPciDeviceInfo > to determine if the UART is behind PCI. > If the Device ID is 0xFF then the serial 16550 UART > is not behind PCI. For such platforms a NULL > implementation of the PCI library has been provided > so that the serial output is available during the > early boot stages. > > On Kvmtool the Serial 16550 UART is not behind PCI, > and therefore makes use of PciLibNull library during > early boot stages. The DXE modules that make use of > PCI functionality explicitly include the library > BasePciLibPciExpress, so that the required PCI > functionality is available. > > The PcdSerialPciDeviceInfo is also set to 0xFF to > indicate that the Serial 16550 UART is not behind > PCI. The PCD PcdSerialUseMmio is also set to TRUE > to indicate MMIO accesses are required for the > UART registers. > > - Dependency order for Flash > FaultTolerantWriteDxe makes use of PCDs (e.g. > PcdFlashNvStorageFtwSpareBase64 etc.), which in > case of kvmtool will be evaluated based on the CFI > flash base address read from the DT. These variables > are populated in the NorFlashPlatformLib loaded by > ArmVeNorFlashDxe. > > This results in a dependency issue with > FaultTolerantWriteDxe. To resolve this make the > NorFlashPlatformLib as a library dependency for > FaultTolerantWriteDxe. > > Signed-off-by: Sami Mujawar > --- > > Notes: > v2: > - Updates to reflect review comments and support [Sami] > for latest features emulated by kvmtool e.g. CFI. > > v1: > - Add support for Kvmtool emulated platform [Sami] > - Add more justification for platform and [Laszlo] > document platform maintainer. > Ref: https://edk2.groups.io/g/devel/topic/30915279#30693 > > ArmVirtPkg/ArmVirtKvmTool.dsc | 408 ++++++++++++++++++++ > ArmVirtPkg/ArmVirtKvmTool.fdf | 276 +++++++++++++ > 2 files changed, 684 insertions(+) > > diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc > new file mode 100644 > index 0000000000000000000000000000000000000000..b2dc5eb2a09521c57a30babbee40749abdb7f7ff > --- /dev/null > +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc > @@ -0,0 +1,408 @@ > +# @file > +# Workspace file for KVMTool virtual platform. > +# > +# Copyright (c) 2018 - 2020, 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 = ArmVirtKvmTool > + PLATFORM_GUID = 4CB2C61E-FA32-4130-8E37-54ABC71A1A43 > + PLATFORM_VERSION = 0.1 > + DSC_SPECIFICATION = 0x0001001B > +!ifdef $(EDK2_OUT_DIR) Can we remove this? > + OUTPUT_DIRECTORY = $(EDK2_OUT_DIR) > +!else > + OUTPUT_DIRECTORY = Build/ArmVirtKvmTool-$(ARCH) > +!endif > + SUPPORTED_ARCHITECTURES = AARCH64|ARM > + BUILD_TARGETS = DEBUG|RELEASE > + SKUID_IDENTIFIER = DEFAULT > + FLASH_DEFINITION = ArmVirtPkg/ArmVirtKvmTool.fdf > + > + # > + # Defines for default states. These can be changed on the command line. > + # -D FLAG=VALUE > + # > + DEFINE SECURE_BOOT_ENABLE = FALSE > + DEFINE HTTP_BOOT_ENABLE = FALSE > + DEFINE TTY_TERMINAL = TRUE > + DEFINE ENABLE_NETWORK = TRUE > + DEFINE TPM2_ENABLE = FALSE > + Please don't define bits and pieces you cannot make use of. This includes PCI, afaik > +!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 > + ArmVirtMemInfoLib|ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.inf > + > + TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf > + NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf > + > + CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf > + > + # BDS Libraries > + UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf > + PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > + BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > + > + CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf > + FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.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 > + > +!if $(HTTP_BOOT_ENABLE) == TRUE > + HttpLib|NetworkPkg/Library/DxeHttpLib/DxeHttpLib.inf > +!endif > + > +!if $(TPM2_ENABLE) == FALSE > + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > + AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf > +!endif > + > +[LibraryClasses.common, LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM] > + # The 16550 Serial port library is dependent on PCI library. > + # A null implementation of the PCI Library has been provided so that > + # the serial output is available during the early boot stages. > + # The DXE modules that make use of PCI override the PciLibNull library > + # and are individually linked with the real PCI library. > + PciLib|MdePkg/Library/PciLibNull/PciLibNull.inf > + PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf > + SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf > + > +[LibraryClasses.common.UEFI_DRIVER] > + UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > + > +[BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE] > + # Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE > + # executable we build for the relocatable PrePi. They are not runtime > + # relocatable in ELF. > + *_CLANG35_*_CC_FLAGS = -mno-movt > + > +################################################################################ > +# > +# 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 > + > + gArmVirtTokenSpaceGuid.PcdTpm2SupportEnabled|$(TPM2_ENABLE) > + > +[PcdsFixedAtBuild.common] > + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F > + > + gArmPlatformTokenSpaceGuid.PcdCoreCount|1 > + > +!if $(ARCH) == AARCH64 > + gArmTokenSpaceGuid.PcdVFPEnabled|1 > +!endif > + > + gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000 > + gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 > + gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800 > + > + # Size of the region used by UEFI in permanent memory (Reserved 64MB) > + gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000 > + > + # > + # ARM PrimeCell > + # > + ## Default Terminal Type > + ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM > +#!if $(TTY_TERMINAL) == TRUE > + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4 > +#!else > +# gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|1 > +#!endif > + > + # > + # ARM Virtual Architectural Timer -- fetch frequency from KVM > + # > + gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0 > + > +!if $(HTTP_BOOT_ENABLE) == TRUE > + gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE > +!endif > + > + # Use MMIO for accessing Serial port registers. > + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|TRUE > + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialPciDeviceInfo|{0xFF} > + > + # Use MMIO for accessing RTC controller registers. > + gPcAtChipsetPkgTokenSpaceGuid.PcdRtcUseMmio|TRUE > + > + 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 > + > +[PcdsPatchableInModule.common] > + # > + # This will be overridden in the code > + # > + gArmTokenSpaceGuid.PcdSystemMemoryBase|0x0 > + gArmTokenSpaceGuid.PcdSystemMemorySize|0x0 > + > + # > + # The device tree base address is handed off by kvmtool. > + # We are booting from RAM using the Linux kernel boot protocol, > + # x0 will point to the DTB image in memory. > + # > + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0 > + > + gArmTokenSpaceGuid.PcdFdBaseAddress|0x0 > + gArmTokenSpaceGuid.PcdFvBaseAddress|0x0 > + > + # we need to provide a resolution for this PCD that supports PcdSet64() > + # being called from ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c, > + # even though that call will be compiled out on this platform as it does > + # not (and cannot) support the TPM2 driver stack > + gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0 > + > +[PcdsDynamicDefault.common] > + gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 > + > + 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 > + > + # > + # PCI settings > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE > + > + # set PcdPciExpressBaseAddress to MAX_UINT64, which signifies that this > + # PCD and PcdPciDisableBusEnumeration above have not been assigned yet > + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF > + > + gArmTokenSpaceGuid.PcdPciIoTranslation|0x0 > + > + # > + # Set video resolution for boot options and for text setup. > + # PlatformDxe can set the former at runtime. > + # > + gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800 > + gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600 > + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640 > + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480 > + > + ## Force DTB > + gArmVirtTokenSpaceGuid.PcdForceNoAcpi|TRUE > + > + # Setup Flash storage variables > + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0 > + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x40000 > + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 > + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x40000 > + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 > + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x40000 > + > +################################################################################ > +# > +# Components Section - list of all EDK II Modules needed by this Platform > +# > +################################################################################ > +[Components.common] > + # > + # PEI Phase modules > + # > + ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf { > + > + ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf > + LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf > + PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf > + HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf > + PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf > + MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf > + } > + > + # > + # DXE > + # > + MdeModulePkg/Core/Dxe/DxeMain.inf { > + > + NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf > + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > + } > + MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { > + > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + } > + > + # > + # Architectural Protocols > + # > + ArmPkg/Drivers/CpuDxe/CpuDxe.inf > + MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf { > + > + NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf > + NULL|EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf > + # don't use unaligned CopyMem () on the UEFI varstore NOR flash region > + BaseMemoryLib|MdePkg/Library/BaseMemoryLibMmio/BaseMemoryLibMmio.inf > + } > + > +!if $(SECURE_BOOT_ENABLE) == TRUE > + MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { > + > + NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf > + } > + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf > +!else > + MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > +!endif > + MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf > + MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf { > + > + NULL|ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf > + } > + > + MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf > + MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf > + MdeModulePkg/Universal/Metronome/Metronome.inf > + PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.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 { > + > + NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf > + } > + ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf { > + > + BaseMemoryLib|MdePkg/Library/BaseMemoryLibMmio/BaseMemoryLibMmio.inf > + } > + > + MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf > + > + # > + # Platform Driver > + # > + ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf > + 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 > + # > + 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 > + > + # > + # Bds > + # > + MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf { > + > + 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 { > + > + NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf > + NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > + NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf > + } > + > +!if $(ENABLE_NETWORK) == TRUE > + # > + # Networking stack > + # > + NetworkPkg/SnpDxe/SnpDxe.inf > + NetworkPkg/DpcDxe/DpcDxe.inf > + NetworkPkg/ArpDxe/ArpDxe.inf > + NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf > + NetworkPkg/Ip4Dxe/Ip4Dxe.inf > + NetworkPkg/MnpDxe/MnpDxe.inf > + NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf > + NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf > + NetworkPkg/Udp4Dxe/Udp4Dxe.inf > + NetworkPkg/TcpDxe/TcpDxe.inf > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > + NetworkPkg/IScsiDxe/IScsiDxe.inf > +!if $(HTTP_BOOT_ENABLE) == TRUE > + NetworkPkg/DnsDxe/DnsDxe.inf > + NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > + NetworkPkg/HttpDxe/HttpDxe.inf > + NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!endif > +!endif > + # > + # SCSI Bus and Disk Driver > + # > + MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf > + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > + > + # > + # PCI support > + # > + ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf { > + > + NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf > + } > + > + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { > + > + PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf > + } > + > + MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf { > + > + NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf > + } > + > + OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf > + OvmfPkg/Virtio10Dxe/Virtio10.inf > diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf > new file mode 100644 > index 0000000000000000000000000000000000000000..8b794e6a1f3652f3262faa35b37f2f8d36d5438d > --- /dev/null > +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf > @@ -0,0 +1,276 @@ > +# > +# Copyright (c) 2018 - 2020, 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. > +# > +################################################################################ > + > +[FD.KVMTOOL_EFI] > +BaseAddress = 0x00000000|gArmTokenSpaceGuid.PcdFdBaseAddress > +# The size in bytes of the FLASH Device > +Size = 0x00200000|gArmTokenSpaceGuid.PcdFdSize > +ErasePolarity = 1 > + > +# This one is tricky, it must be: BlockSize * NumBlocks = Size > +BlockSize = 0x00001000 > +NumBlocks = 0x200 > + > +################################################################################ > +# > +# 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 > +# > +################################################################################ > + > +# > +# Implement the Linux kernel header layout so that the loader will identify > +# it as something bootable, and execute it with a FDT pointer in x0 or r2. > +# This area will be reused to store a copy of the FDT so round it up to 32 KB. > +# > +0x00000000|0x00008000 > +DATA = { > +!if $(ARCH) == AARCH64 > + 0x01, 0x00, 0x00, 0x10, # code0: adr x1, . > + 0xff, 0x1f, 0x00, 0x14, # code1: b 0x8000 > + 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, # text_offset: 512 KB > + 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, # image_size: 2 MB > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # flags > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res2 > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res3 > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # res4 > + 0x41, 0x52, 0x4d, 0x64, # magic: "ARM\x64" > + 0x00, 0x00, 0x00, 0x00 # res5 > +!else > + 0x08, 0x10, 0x4f, 0xe2, # adr r1, . > + 0x02, 0x00, 0xa0, 0xe1, # mov r0, r2 (DTB) > + 0x00, 0x00, 0xa0, 0xe1, # nop > + 0x00, 0x00, 0xa0, 0xe1, # nop > + 0x00, 0x00, 0xa0, 0xe1, # nop > + 0x00, 0x00, 0xa0, 0xe1, # nop > + 0x00, 0x00, 0xa0, 0xe1, # nop > + 0x00, 0x00, 0xa0, 0xe1, # nop > + > + 0xf6, 0x1f, 0x00, 0xea, # b 0x8000 > + 0x18, 0x28, 0x6f, 0x01, # magic > + 0x00, 0x00, 0x00, 0x00, # start > + 0x00, 0x00, 0x20, 0x00, # image size: 2 MB > + 0x01, 0x02, 0x03, 0x04 # endiannness flag > +!endif > +} > + > +0x00008000|0x001f8000 > +gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize > +FV = FVMAIN_COMPACT > + > +################################################################################ > +# > +# 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 = 64074afe-340a-4be6-94ba-91b5b4d0f71e > +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/KvmtoolPlatformDxe/KvmtoolPlatformDxe.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 MdeModulePkg/Universal/Metronome/Metronome.inf > + INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.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 > + INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf > + > + # > + # FAT filesystem + GPT/MBR partitioning + UDF filesystem > + # > + 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 > + > + # > + # 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 > + > + # > + # 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 > + > +!if $(ENABLE_NETWORK) == TRUE > + # > + # Networking stack > + # > + INF NetworkPkg/SnpDxe/SnpDxe.inf > + INF NetworkPkg/DpcDxe/DpcDxe.inf > + INF NetworkPkg/ArpDxe/ArpDxe.inf > + INF NetworkPkg/Dhcp4Dxe/Dhcp4Dxe.inf > + INF NetworkPkg/Ip4Dxe/Ip4Dxe.inf > + INF NetworkPkg/MnpDxe/MnpDxe.inf > + INF NetworkPkg/VlanConfigDxe/VlanConfigDxe.inf > + INF NetworkPkg/Mtftp4Dxe/Mtftp4Dxe.inf > + INF NetworkPkg/Udp4Dxe/Udp4Dxe.inf > + INF NetworkPkg/TcpDxe/TcpDxe.inf > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > + INF NetworkPkg/IScsiDxe/IScsiDxe.inf > +!if $(HTTP_BOOT_ENABLE) == TRUE > + INF NetworkPkg/DnsDxe/DnsDxe.inf > + INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > + INF NetworkPkg/HttpDxe/HttpDxe.inf > + INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > +!endif > +!endif > + # > + # SCSI Bus and Disk Driver > + # > + INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf > + INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf > + > +!if $(ARCH) == AARCH64 > + # > + # 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/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 ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.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 >