From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.groups.io with SMTP id smtpd.web11.303.1614618311751029911 for ; Mon, 01 Mar 2021 09:05:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=SZIci3t1; spf=pass (domain: nuviainc.com, ip: 209.85.221.52, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f52.google.com with SMTP id h98so16910524wrh.11 for ; Mon, 01 Mar 2021 09:05:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=3iXXvn2X6+CbdkAmzfPHZCJukpmz/M0Mfrpin8QsUrg=; b=SZIci3t1E49Hg2hSh9WirQDIwtSNrLAGX+FkNtsksIiNqbCU0X08CT/OczmiUkX+vm HSe07rPJSJWN4l9zOJT0FhcJcsrpDJRZAnEgzhc6CWUad5jH+MDJBusQwNc5NMMtAExd Q7h1wUiUc+MAheqvJthPShRp8+qHFGMsCdVfHqilz5O9gtBzmiSED+e0sxzRR1vmHEen Ff7XoS4VbitM42Ly/PYLWyGG8gL7C2B7/Dy6v4Roy9euUnJFM7Bel80dg9iPDWZ7WIJt alDDcU+rcuwok/IaaJv6qLp5EzF4SeWhQIclsKWXpE1RimOdWjC3Wi5nbliQwPRf8tCD i6eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=3iXXvn2X6+CbdkAmzfPHZCJukpmz/M0Mfrpin8QsUrg=; b=Vr9u1u1kgzgmpkbgMT25AgQV0K8YqnxLgk3jGUURUccYQelWlxgiMmUzSFFgevEYsK WJ8X5ClpVXulUeRP5VWff71ws7mq+3WJMt0F1nPqogp5oMmToQMNdiauJXxRwSasTI2s uC6aS53k+JgRHDl0cCzEPRh2vAGAGUBOWVoPekmcDWrkCpkh9DL3TkTC+Fdi15/zhOps FqLeKraEhD+rMYJey1dMug+RuOE6Jh33qr6MjKUFcj2NCmzYPQ/V1Ri/V7gIKCyouS5h HM3EfYJDhBCgkwLCW495DFsAY43mqKHrQpl0HVw1o0IqTcfSwyXCOb3E5Aj5V31Z/PA2 /cMw== X-Gm-Message-State: AOAM531j1oE6Jo+6NEdcjFEg+AhDpQ2IGOpLBv/1VHkMf/lS6qVHF8PH fb2xIOm8BRtnkrcwjslqseM4Ow== X-Google-Smtp-Source: ABdhPJy48tbSN1NIvpjtGZ4s8LPXq//DnC9JhfAt0s4rQHS3iITPulB+1j130nCbNy+oSe08fByWQQ== X-Received: by 2002:a5d:4587:: with SMTP id p7mr4025098wrq.205.1614618310155; Mon, 01 Mar 2021 09:05:10 -0800 (PST) Return-Path: Received: from vanye (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id s124sm22202392wms.40.2021.03.01.09.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 09:05:09 -0800 (PST) Date: Mon, 1 Mar 2021 17:05:07 +0000 From: "Leif Lindholm" To: Masahisa Kojima Cc: devel@edk2.groups.io, Ard Biesheuvel , Graeme Gregory , Radoslaw Biernacki , Shashi Mallela Subject: Re: [PATCH edk2-platforms v2 1/4] SbsaQemu: Build infrastructure for StandaloneMm image Message-ID: <20210301170507.GT1664@vanye> References: <20210301051952.29091-1-masahisa.kojima@linaro.org> <20210301051952.29091-2-masahisa.kojima@linaro.org> MIME-Version: 1.0 In-Reply-To: <20210301051952.29091-2-masahisa.kojima@linaro.org> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Mar 01, 2021 at 14:19:49 +0900, Masahisa Kojima wrote: > Add the build infrastructure for compilation of StandaloneMm image. > > Signed-off-by: Masahisa Kojima > --- > .../Qemu/SbsaQemu/SbsaQemuStandaloneMm.dsc | 132 ++++++++++++++++++ Please use --stat=1000 --stat-graph-width=20 when generating patches. > Platform/Qemu/SbsaQemu/SbsaQemu.fdf | 6 +- It is not immediately obvious to me why the pre-existing SbsaQemuStandaloneMm.dsc needs to change. Is this something that can be clarified in commit message? Best Regards, Leif > .../Qemu/SbsaQemu/SbsaQemuStandaloneMm.fdf | 93 ++++++++++++ > 3 files changed, 228 insertions(+), 3 deletions(-) > create mode 100644 Platform/Qemu/SbsaQemu/SbsaQemuStandaloneMm.dsc > create mode 100644 Platform/Qemu/SbsaQemu/SbsaQemuStandaloneMm.fdf > > diff --git a/Platform/Qemu/SbsaQemu/SbsaQemuStandaloneMm.dsc b/Platform/Qemu/SbsaQemu/SbsaQemuStandaloneMm.dsc > new file mode 100644 > index 000000000000..87f5ee351eaa > --- /dev/null > +++ b/Platform/Qemu/SbsaQemu/SbsaQemuStandaloneMm.dsc > @@ -0,0 +1,132 @@ > +# > +# Copyright (c) 2020, Linaro 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 = SbsaQemuStandaloneMm > + PLATFORM_GUID = A64CC0F5-7ACD-4975-BBE7-7EF6739C8668 > + PLATFORM_VERSION = 1.0 > + DSC_SPECIFICATION = 0x00010011 > + OUTPUT_DIRECTORY = Build/$(PLATFORM_NAME) > + SUPPORTED_ARCHITECTURES = AARCH64 > + BUILD_TARGETS = DEBUG|RELEASE|NOOPT > + SKUID_IDENTIFIER = DEFAULT > + FLASH_DEFINITION = Platform/Qemu/SbsaQemu/SbsaQemuStandaloneMm.fdf > + DEFINE DEBUG_MESSAGE = TRUE > + > + # LzmaF86 > + DEFINE COMPRESSION_TOOL_GUID = D42AE6BD-1352-4bfb-909A-CA72A6EAE889 > + > +################################################################################ > +# > +# Library Class section - list of all Library Classes needed by this Platform. > +# > +################################################################################ > +[LibraryClasses] > + # > + # Basic > + # > + BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > + BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf > + DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > + DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf > + ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf > + FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf > + HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf > + IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf > + MemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf > + MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMmCoreMemoryAllocationLib.inf > + PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf > + PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf > + PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > + ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf > + > + # > + # Entry point > + # > + StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf > + > + ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf > + StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf > + ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf > + CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf > + PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf > + > + # ARM PL011 UART Driver > + PL011UartClockLib|ArmPlatformPkg/Library/PL011UartClockLib/PL011UartClockLib.inf > + PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf > + SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf > + > + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf > + > + # > + # It is not possible to prevent the ARM compiler for generic intrinsic functions. > + # This library provides the instrinsic functions generate by a given compiler. > + # And NULL mean link this library into all ARM images. > + # > + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf > + > +[LibraryClasses.common.MM_STANDALONE] > + HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf > + MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLib.inf > + MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf > + > +################################################################################ > +# > +# Pcd Section - list of all EDK II PCD Entries defined by this Platform > +# > +################################################################################ > +[PcdsFixedAtBuild] > + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x800000CF > + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xff > + gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x0f > + > + ## PL011 - Serial Terminal > + gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x60040000 > + gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 > + > + gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2 > + > +################################################################################################### > +# > +# Components Section - list of the modules and components that will be processed by compilation > +# tools and the EDK II tools to generate PE32/PE32+/Coff image files. > +# > +# Note: The EDK II DSC file is not used to specify how compiled binary images get placed > +# into firmware volume images. This section is just a list of modules to compile from > +# source into UEFI-compliant binaries. > +# It is the FDF file that contains information on combining binary files into firmware > +# volume images, whose concept is beyond UEFI and is described in PI specification. > +# Binary modules do not need to be listed in this section, as they should be > +# specified in the FDF file. For example: Shell binary (Shell_Full.efi), FAT binary (Fat.efi), > +# Logo (Logo.bmp), and etc. > +# There may also be modules listed in this section that are not required in the FDF file, > +# When a module listed here is excluded from FDF file, then UEFI-compliant binary will be > +# generated for it, but the binary will not be put into any firmware volume. > +# > +################################################################################################### > +[Components.common] > + # > + # MM Core > + # > + StandaloneMmPkg/Core/StandaloneMmCore.inf > + StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf > + > +################################################################################################### > +# > +# BuildOptions Section - Define the module specific tool chain flags that should be used as > +# the default flags for a module. These flags are appended to any > +# standard flags that are defined by the build process. They can be > +# applied for any modules or only those modules with the specific > +# module style (EDK or EDKII) specified in [Components] section. > +# > +################################################################################################### > +[BuildOptions.AARCH64] > + GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 -march=armv8-a+nofp > diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > index c35e3ed44054..b61ae1891233 100644 > --- a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf > @@ -21,10 +21,10 @@ > > [FD.SBSA_FLASH0] > BaseAddress = 0x00000000 > -Size = 0x00200000 > +Size = 0x00400000 > ErasePolarity = 1 > BlockSize = 0x00001000 > -NumBlocks = 0x200 > +NumBlocks = 0x400 > > ################################################################################ > # > @@ -47,7 +47,7 @@ [FD.SBSA_FLASH0] > FILE = Platform/Qemu/Sbsa/bl1.bin > > # and FIP (BL2 + BL31) > -0x00008000|0x00020000 > +0x00008000|0x00300000 > FILE = Platform/Qemu/Sbsa/fip.bin > > ################################################################################ > diff --git a/Platform/Qemu/SbsaQemu/SbsaQemuStandaloneMm.fdf b/Platform/Qemu/SbsaQemu/SbsaQemuStandaloneMm.fdf > new file mode 100644 > index 000000000000..a1acefcfb0a7 > --- /dev/null > +++ b/Platform/Qemu/SbsaQemu/SbsaQemuStandaloneMm.fdf > @@ -0,0 +1,93 @@ > +# > +# Copyright (c) 2020, Linaro 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.STANDALONE_MM] > +BaseAddress = 0x20001000|gArmTokenSpaceGuid.PcdFdBaseAddress > +Size = 0x00e00000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the device (14MiB). > +ErasePolarity = 1 > + > +BlockSize = 0x00001000 > +NumBlocks = 0x0e00 > + > +0x00000000|0x00280000 > +gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize > +FV = FVMAIN_COMPACT > + > +[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 StandaloneMmPkg/Core/StandaloneMmCore.inf > + INF StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf > + > +################################################################################ > +# > +# Rules are use with the [FV] section's module INF type to define > +# how an FFS file is created for a given INF file. The following Rule are the default > +# rules for the different module type. User can add the customized rules to define the > +# content of the FFS file. > +# > +################################################################################ > + > + > +############################################################################ > +# Example of a DXE_DRIVER FFS file with a Checksum encapsulation section # > +############################################################################ > +# > +#[Rule.Common.DXE_DRIVER] > +# FILE DRIVER = $(NAMED_GUID) { > +# DXE_DEPEX DXE_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex > +# COMPRESS PI_STD { > +# GUIDED { > +# PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi > +# UI STRING="$(MODULE_NAME)" Optional > +# VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) > +# } > +# } > +# } > +# > +############################################################################ > + > +[Rule.Common.MM_CORE_STANDALONE] > + FILE SEC = $(NAMED_GUID) RELOCS_STRIPPED FIXED { > + PE32 PE32 Align = Auto $(INF_OUTPUT)/$(MODULE_NAME).efi > + } > + > +[Rule.Common.MM_STANDALONE] > + FILE MM_STANDALONE = $(NAMED_GUID) { > + SMM_DEPEX SMM_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex > + PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi > + UI STRING="$(MODULE_NAME)" Optional > + VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) > + } > -- > 2.17.1 >