From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web12.1628.1635796812059256325 for ; Mon, 01 Nov 2021 13:00:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@corthon-com.20210112.gappssmtp.com header.s=20210112 header.b=vgFhrH49; spf=none, err=permanent DNS error (domain: corthon.com, ip: 209.85.214.176, mailfrom: bret@corthon.com) Received: by mail-pl1-f176.google.com with SMTP id b13so985479plg.2 for ; Mon, 01 Nov 2021 13:00:12 -0700 (PDT) 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=7KaVi3E4o51PGK/ghbQ0nM52pur3TqBswZG+vFSOuDY=; b=vgFhrH49sO2fIGlUa3ExgeLndHaV83BB54BcEdXsJL12qnsm2vXZhUd+8kYhWI+k/w 3kq6TOsnpyb9w17SCg24qC41kcoLbQW1lCRhjAm2OPk3zdVDUAJgxkMnsPov8QP4MdI2 gcPi/Q/lY4rCDuaUHm3iUnFvlXCOeb0CuwhdSonzNY22zPJhryG7r/zKdg8tt9uE6cg7 cWVt2Pn8WKnWwMpAczvrm6BrNFoz93GVKkYmJ3nFwns/uzcokYn3AA9W/kCG5DNzBTr+ 0UQss0IY8t5WPUw76rH7uVxqe9XU3XZHx/YCcBmVfF4eiLGSPJFTsRt+4Dit1ErS0MU1 GGXg== 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=7KaVi3E4o51PGK/ghbQ0nM52pur3TqBswZG+vFSOuDY=; b=cPYrmfw/RMDKbJW2ngJhC8uVQTqPq8LqG4WWOXcEg5Vtcu8Ut9ORQIMRVszCi68ote 5QZHXYJCydDi6NCAIQy7QtUO/OOscAGW4MuAUFA49bgL4EhWJfMlULYBlMDmz0x5MKSA CJyUswntZ7VrZf57fbPwDj4MxrF73OAC9eMMDTnWtMeaWRW9kGQQqaWbg+vO5MYvS02P bqH2gjPlZSc8i5JbpnM1G36YUth11/eh2ddZtXf4sBZXoKRu6ZxaLPKeqg/NptM/8hcy HODd6MQiS+TtnPyDhaMnFXiTle3RT3lZ3oHsp5I6PNUNyr78wBgUFAbI9KT/PyFE8EgM lRpA== X-Gm-Message-State: AOAM530JDoQ4AFb7AsI4DEXZZaFTUpjI4dBnoDrzkI0Rs5XbtOyIShpV TOQ4fQASWIeoxDFxyui2SOZVYZLw3i26DyHC X-Google-Smtp-Source: ABdhPJyxPBE3YwQCQoM72G0d3jy3HX0gIoBi5q4zP7Fzc2DbJ27K5bl0vl5vktSU1LZb91pjJs8ydw== X-Received: by 2002:a17:902:c643:b0:141:cf6b:6999 with SMTP id s3-20020a170902c64300b00141cf6b6999mr13299512pls.80.1635796811395; Mon, 01 Nov 2021 13:00:11 -0700 (PDT) Return-Path: Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t2sm13759796pgf.35.2021.11.01.13.00.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 13:00:10 -0700 (PDT) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sean Brogan Subject: [PATCH v1 14/16] ArmPkg/Library: Convert StandaloneMmCoreEntryPoint to Arm-only Date: Mon, 1 Nov 2021 12:56:46 -0700 Message-Id: <20211101195648.6420-15-brbarkel@microsoft.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-1-brbarkel@microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Bret Barkelew Drop X64 references. Update GUID. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3652 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sean Brogan Signed-off-by: Bret Barkelew --- ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c= | 71 -------------------- ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf = | 6 +- 2 files changed, 2 insertions(+), 75 deletions(-) diff --git a/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCore= EntryPoint.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCo= reEntryPoint.c deleted file mode 100644 index dffa965b8425..000000000000 --- a/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPo= int.c +++ /dev/null @@ -1,71 +0,0 @@ -/** @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 -=0D -#include =0D -#include =0D -#include =0D -=0D -//=0D -// Cache copy of HobList pointer.=0D -//=0D -VOID *gHobList =3D NULL;=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 - //=0D - // Cache a pointer to the HobList=0D - //=0D - gHobList =3D HobStart;=0D -=0D - //=0D - // Call the Standalone MM Core entry point=0D - //=0D - ProcessModuleEntryPointList (HobStart);=0D -=0D - //=0D - // TODO: Set page table here?? AARCH64 has this step for some reason=0D - //=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/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntr= yPoint.inf b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntr= yPoint.inf index a0629cbc1a6f..c6b283653882 100644 --- a/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.= inf +++ b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.= inf @@ -10,8 +10,8 @@ =0D [Defines]=0D INF_VERSION =3D 0x0001001A=0D - BASE_NAME =3D StandaloneMmCoreEntryPoint=0D - FILE_GUID =3D C97AC593-109A-4C63-905C-675FDE2689E8= =0D + BASE_NAME =3D ArmStandaloneMmCoreEntryPoint=0D + FILE_GUID =3D 0D7C6883-E1A8-4A7A-A35C-E0C200775B43= =0D MODULE_TYPE =3D MM_CORE_STANDALONE=0D VERSION_STRING =3D 1.0=0D PI_SPECIFICATION_VERSION =3D 0x00010032=0D @@ -26,8 +26,6 @@ [Sources.AARCH64, Sources.ARM] Arm/SetPermissions.c=0D Arm/CreateHobList.c=0D =0D -[Sources.X64]=0D - X64/StandaloneMmCoreEntryPoint.c=0D =0D [Packages]=0D MdePkg/MdePkg.dec=0D --=20 2.31.1.windows.1