From nobody Mon Feb 9 09:22:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83625+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83625+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590361; cv=none; d=zohomail.com; s=zohoarc; b=C7p1Pp0xvfomBjbQfIKgkLOrl0yvU14GLWQ0qmo0mSvMGsGXb+FSeiD37FDTqn0ZBypT/6rosr9eHiYcUCX29LO+7fXlqM8bfqlSyNaB0yqlUJWo13hF/hcckKTnvt9ZYSPGKLS3RMnKCHSsbR9qru4oXNGU77YudiioVAMa5mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590361; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=YDJw/DM+SouvpJCcfTy2ANrSJlutjzTxytm3eeYA9Sk=; b=PRGEkI/HHQ3hBH/Mwvf5XAuRpFOh7fMkJPAeH0BTbsO01XhIdtuavCyI86pf02cGPrT6Halc3R9HE70vRdV22pm8T02O1e43BzSGVba+4peQ2J+vAPQ9i3PPT8M4gVmtt8fUfSHMJ6Mdc7cjkaEOhgw5u31vtAG9tpAlLzWZh7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83625+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590361028833.112744212275; Wed, 10 Nov 2021 16:26:01 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id JD1jYY1788612xOnU7uKAfo6; Wed, 10 Nov 2021 16:26:00 -0800 X-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 X-Received: by mail-pf1-f175.google.com with SMTP id b68so4047937pfg.11 for ; Wed, 10 Nov 2021 16:25:53 -0800 (PST) X-Gm-Message-State: 2X3GI19RCZxGjaGtcAIoBk4Ix1787277AA= 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) X-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: [edk2-devel] [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> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590360; bh=TBRTRIlLgLUeaI1ZJl6jeujICSD0FW6pwWRYMU7nw2U=; h=Cc:Date:From:Reply-To:Subject:To; b=o1te8gMhqnDfjtQDp6+QE3xrBftDWR1UiSlKmxPY7wnPsK/wLj09zA11lqbXaVdPQ7s rARhdMqEXeWKH2Z3aNu93Kt1QvV9knmc5BUGeJHoqjgOMocq/d8VRvOg61jGlCdeDAsL0 Td1IhQ9RvAyOZZ4s48dNw4j9xvfXqR1b35c= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590361357100020 Content-Type: text/plain; charset="utf-8" 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 + Entry point to the Standalone Mm Core. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation. +SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + + +#include +#include + +/** + The entry point of PE/COFF Image for the STANDALONE MM Core. + + This function is the entry point for the STANDALONE MM Core. This functi= on is required to call + ProcessModuleEntryPointList() and ProcessModuleEntryPointList() is never= expected to return. + The STANDALONE MM Core is responsible for calling ProcessLibraryConstruc= torList() as soon as the EFI + System Table and the image handle for the STANDALONE MM Core itself have= been established. + If ProcessModuleEntryPointList() returns, then ASSERT() and halt the sys= tem. + + @param HobStart Pointer to the beginning of the HOB List passed in fro= m the PEI Phase. + +**/ +VOID +EFIAPI +_ModuleEntryPoint ( + IN VOID *HobStart + ) +{ + // Do nothing. This is a NULL implementation. +} + + +/** + Required by the EBC compiler and identical in functionality to _ModuleEn= tryPoint(). + + This function is required to call _ModuleEntryPoint() passing in HobStar= t. + + @param HobStart Pointer to the beginning of the HOB List passed in fro= m the PEI Phase. + +**/ +VOID +EFIAPI +EfiMain ( + IN VOID *HobStart + ) +{ + _ModuleEntryPoint (HobStart); +} 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 +# Module entry point library for DXE core. +# +# Copyright (c) 2017 - 2021, Arm Ltd. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# +## + +[Defines] + INF_VERSION =3D 0x0001001A + BASE_NAME =3D StandaloneMmCoreEntryPointNull + FILE_GUID =3D 5E28E9FA-67DC-4408-A177-05F72CD7E248 + MODULE_TYPE =3D MM_CORE_STANDALONE + VERSION_STRING =3D 1.0 + PI_SPECIFICATION_VERSION =3D 0x00010032 + LIBRARY_CLASS =3D StandaloneMmCoreEntryPoint|MM_CORE_ST= ANDALONE + +# +# VALID_ARCHITECTURES =3D IA32 X64 IPF EBC (EBC is for build on= ly) +# + +[Sources] + StandaloneMmCoreEntryPointNull.c + +[Packages] + MdePkg/MdePkg.dec + +[LibraryClasses] + BaseLib + DebugLib 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 PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepor= tStatusCodeLibNull.inf - StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= PointNull/StandaloneMmCoreEntryPointNull.inf StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint= /StandaloneMmDriverEntryPoint.inf VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/Variab= leMmDependency.inf MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf =20 +[LibraryClasses.X64] + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf + [LibraryClasses.AARCH64, LibraryClasses.ARM] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmL= ib.inf @@ -111,13 +114,16 @@ [Components.common] # StandaloneMmPkg/Core/StandaloneMmCore.inf StandaloneMmPkg/Library/FvLib/FvLib.inf - StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMm= CoreMemoryAllocationLib.inf StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemo= ryAllocationLib.inf StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf + StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreE= ntryPointNull.inf + +[Components.X64] + StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf =20 [Components.AARCH64, Components.ARM] StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeC= offExtraActionLib.inf 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 PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepor= tStatusCodeLibNull.inf - StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf +<<<<<<< HEAD + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= PointNull/StandaloneMmCoreEntryPointNull.inf +=3D=3D=3D=3D=3D=3D=3D +>>>>>>> f71ccd340de8 (ArmPkg: Create an Arm-specific version of Standalone= MmCoreEntryPoint) StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint= /StandaloneMmDriverEntryPoint.inf VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/Variab= leMmDependency.inf MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf =20 +[LibraryClasses.X64] + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf + [LibraryClasses.AARCH64, LibraryClasses.ARM] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmL= ib.inf @@ -111,13 +117,19 @@ [Components.common] # StandaloneMmPkg/Core/StandaloneMmCore.inf StandaloneMmPkg/Library/FvLib/FvLib.inf - StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMm= CoreMemoryAllocationLib.inf StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemo= ryAllocationLib.inf StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf + StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreE= ntryPointNull.inf + +[Components.X64] + StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf + +[Components.X64] + StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf =20 [Components.AARCH64, Components.ARM] StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeC= offExtraActionLib.inf --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83625): https://edk2.groups.io/g/devel/message/83625 Mute This Topic: https://groups.io/mt/86971573/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-