From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web11.3970.1636590353993511863 for ; Wed, 10 Nov 2021 16:25:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@corthon-com.20210112.gappssmtp.com header.s=20210112 header.b=QA2PkcaI; spf=none, err=permanent DNS error (domain: corthon.com, ip: 209.85.210.175, mailfrom: bret@corthon.com) Received: by mail-pf1-f175.google.com with SMTP id b68so4047937pfg.11 for ; Wed, 10 Nov 2021 16:25:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corthon-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0ni1+BN568LrJUAQR0vFq8dUdsU+Xis75ofyg7OE7SU=; b=QA2PkcaIUwEiCX7PSJfQ0WfL7SuRU3Bg8Qwuu2U4yL1J/QM4IRISzD1jemWR8PiypG qc3QeCU2SDhQXwoyI+MTCNXs8gm3vk49A7ry4ApdghYafcskrHTcv6wc8G3rK9Dtrziq /plpJbOn7E8hKpLWCobMDycmZR5ypojmhKnnolU+2ZtQqhqvAmGIgPQW8LxLHe9CJf6y PLlKQFOEhRNVoef9Vvwt7Kc9sVYt4U/eaUAPzSCAA5UoktCpD08UZTd9xo6Thj46WbRK wMSiNDRHgEVm7uMYKtbQ0W82G3nDSJeOjcJYw5A23WzHdqk2zsJuB9yl7Hksnl6uvHeq JPIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0ni1+BN568LrJUAQR0vFq8dUdsU+Xis75ofyg7OE7SU=; b=Ub9ZXeDpPYuupuOSAqTXEJ2krfJ3Imhh0WzetYK+MQKjshwzU3kttTuTsfpCKMN578 jcfaVPFvTnTg6yTBYBpYV6ypKB2sZFCbTMU0IXIyoNeyiWGtl0x0yV4/dQj/ZMgZBmUB 6fCdMrrUS1qk58wMQktDTU4KYVECVggsJIiYIqtN+3EtkOG0Pcs31wCjauYeLf5Ol3wZ NS7XEZwVvOHqEGvjyvezlmL2XIU93JU8fgtQ7YW2qdINZfbMB8+ACG/yl83P5Msnc4dH WtYrHHXMedyFg40tsVklC7c058S63cunYgfD19+pVTkY4QFUDNmAt1x44mTc0EdiOuBA iObw== X-Gm-Message-State: AOAM530MJdeXN8YGz/1O7rxq8X2omNdHzhtF+CXt74m/mH37+mtebp91 ayBqRWJHFNEGhaXqwyAI9Aao+t1DWSAhqOFG X-Google-Smtp-Source: ABdhPJyxaMBZ2nGsJWu/vJVXZ+J70JYk7MOZvo2LhxyX90Bao9LYGeBHHWxzr/eNikpmx3LmTmtaTA== X-Received: by 2002:a63:720c:: with SMTP id n12mr1924733pgc.95.1636590353099; Wed, 10 Nov 2021 16:25:53 -0800 (PST) Return-Path: Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:25:52 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Sean Brogan Subject: [PATCH v3 13/14] StandaloneMmPkg: Add StandaloneMmCoreEntryNull to satisfy CI on all archs Date: Wed, 10 Nov 2021 16:24:15 -0800 Message-Id: <20211111002416.1770-14-brbarkel@microsoft.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Bret Barkelew In order to separate this libary into architecture-specific versions, first create a NULL implementation that can pass CI on any arch. Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Cc: Sean Brogan Signed-off-by: Bret Barkelew --- StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreEnt= ryPointNull.c | 51 ++++++++++++++++++++ StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreEnt= ryPointNull.inf | 32 ++++++++++++ StandaloneMmPkg/StandaloneMmPkg.dsc = | 10 +++- StandaloneMmPkg/{StandaloneMmPkg.dsc =3D> StandaloneMmPkg.dsc.orig} = | 16 +++++- 4 files changed, 105 insertions(+), 4 deletions(-) diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/Standal= oneMmCoreEntryPointNull.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPo= intNull/StandaloneMmCoreEntryPointNull.c new file mode 100644 index 000000000000..2c1fd5a9b6ca --- /dev/null +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCo= reEntryPointNull.c @@ -0,0 +1,51 @@ +/** @file=0D + Entry point to the Standalone Mm Core.=0D +=0D +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
=0D +Copyright (c) Microsoft Corporation.=0D +SPDX-License-Identifier: BSD-2-Clause-Patent=0D +=0D +**/=0D +=0D +=0D +#include =0D +#include =0D +=0D +/**=0D + The entry point of PE/COFF Image for the STANDALONE MM Core.=0D +=0D + This function is the entry point for the STANDALONE MM Core. This functi= on is required to call=0D + ProcessModuleEntryPointList() and ProcessModuleEntryPointList() is never= expected to return.=0D + The STANDALONE MM Core is responsible for calling ProcessLibraryConstruc= torList() as soon as the EFI=0D + System Table and the image handle for the STANDALONE MM Core itself have= been established.=0D + If ProcessModuleEntryPointList() returns, then ASSERT() and halt the sys= tem.=0D +=0D + @param HobStart Pointer to the beginning of the HOB List passed in fro= m the PEI Phase.=0D +=0D +**/=0D +VOID=0D +EFIAPI=0D +_ModuleEntryPoint (=0D + IN VOID *HobStart=0D + )=0D +{=0D + // Do nothing. This is a NULL implementation.=0D +}=0D +=0D +=0D +/**=0D + Required by the EBC compiler and identical in functionality to _ModuleEn= tryPoint().=0D +=0D + This function is required to call _ModuleEntryPoint() passing in HobStar= t.=0D +=0D + @param HobStart Pointer to the beginning of the HOB List passed in fro= m the PEI Phase.=0D +=0D +**/=0D +VOID=0D +EFIAPI=0D +EfiMain (=0D + IN VOID *HobStart=0D + )=0D +{=0D + _ModuleEntryPoint (HobStart);=0D +}=0D diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/Standal= oneMmCoreEntryPointNull.inf b/StandaloneMmPkg/Library/StandaloneMmCoreEntry= PointNull/StandaloneMmCoreEntryPointNull.inf new file mode 100644 index 000000000000..4fd80a5c0841 --- /dev/null +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCo= reEntryPointNull.inf @@ -0,0 +1,32 @@ +## @file=0D +# Module entry point library for DXE core.=0D +#=0D +# Copyright (c) 2017 - 2021, Arm Ltd. All rights reserved.
=0D +#=0D +# SPDX-License-Identifier: BSD-2-Clause-Patent=0D +#=0D +#=0D +##=0D +=0D +[Defines]=0D + INF_VERSION =3D 0x0001001A=0D + BASE_NAME =3D StandaloneMmCoreEntryPointNull=0D + FILE_GUID =3D 5E28E9FA-67DC-4408-A177-05F72CD7E248= =0D + MODULE_TYPE =3D MM_CORE_STANDALONE=0D + VERSION_STRING =3D 1.0=0D + PI_SPECIFICATION_VERSION =3D 0x00010032=0D + LIBRARY_CLASS =3D StandaloneMmCoreEntryPoint|MM_CORE_ST= ANDALONE=0D +=0D +#=0D +# VALID_ARCHITECTURES =3D IA32 X64 IPF EBC (EBC is for build on= ly)=0D +#=0D +=0D +[Sources]=0D + StandaloneMmCoreEntryPointNull.c=0D +=0D +[Packages]=0D + MdePkg/MdePkg.dec=0D +=0D +[LibraryClasses]=0D + BaseLib=0D + DebugLib=0D diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standalo= neMmPkg.dsc index a7b42d9c2882..d72019d0cce2 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc @@ -56,11 +56,14 @@ [LibraryClasses] PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf=0D PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf=0D ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepor= tStatusCodeLibNull.inf=0D - StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf=0D + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= PointNull/StandaloneMmCoreEntryPointNull.inf=0D StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint= /StandaloneMmDriverEntryPoint.inf=0D VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/Variab= leMmDependency.inf=0D MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf=0D =0D +[LibraryClasses.X64]=0D + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf=0D +=0D [LibraryClasses.AARCH64, LibraryClasses.ARM]=0D ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf=0D StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmL= ib.inf=0D @@ -111,13 +114,16 @@ [Components.common] #=0D StandaloneMmPkg/Core/StandaloneMmCore.inf=0D StandaloneMmPkg/Library/FvLib/FvLib.inf=0D - StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf=0D StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.in= f=0D StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMm= CoreMemoryAllocationLib.inf=0D StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf=0D StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf=0D StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemo= ryAllocationLib.inf=0D StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf=0D + StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreE= ntryPointNull.inf=0D +=0D +[Components.X64]=0D + StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf=0D =0D [Components.AARCH64, Components.ARM]=0D StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeC= offExtraActionLib.inf=0D diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standalo= neMmPkg.dsc.orig similarity index 92% copy from StandaloneMmPkg/StandaloneMmPkg.dsc copy to StandaloneMmPkg/StandaloneMmPkg.dsc.orig index a7b42d9c2882..875b128a8045 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc.orig @@ -56,11 +56,17 @@ [LibraryClasses] PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf=0D PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf=0D ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepor= tStatusCodeLibNull.inf=0D - StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf=0D +<<<<<<< HEAD=0D + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= PointNull/StandaloneMmCoreEntryPointNull.inf=0D +=3D=3D=3D=3D=3D=3D=3D=0D +>>>>>>> f71ccd340de8 (ArmPkg: Create an Arm-specific version of Standalone= MmCoreEntryPoint)=0D StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint= /StandaloneMmDriverEntryPoint.inf=0D VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/Variab= leMmDependency.inf=0D MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf=0D =0D +[LibraryClasses.X64]=0D + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf=0D +=0D [LibraryClasses.AARCH64, LibraryClasses.ARM]=0D ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf=0D StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmL= ib.inf=0D @@ -111,13 +117,19 @@ [Components.common] #=0D StandaloneMmPkg/Core/StandaloneMmCore.inf=0D StandaloneMmPkg/Library/FvLib/FvLib.inf=0D - StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf=0D StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.in= f=0D StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMm= CoreMemoryAllocationLib.inf=0D StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf=0D StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf=0D StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemo= ryAllocationLib.inf=0D StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf=0D + StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreE= ntryPointNull.inf=0D +=0D +[Components.X64]=0D + StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf=0D +=0D +[Components.X64]=0D + StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf=0D =0D [Components.AARCH64, Components.ARM]=0D StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeC= offExtraActionLib.inf=0D --=20 2.31.1.windows.1