From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web08.921.1635884514413261824 for ; Tue, 02 Nov 2021 13:21:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@corthon-com.20210112.gappssmtp.com header.s=20210112 header.b=bGlId/xk; spf=none, err=permanent DNS error (domain: corthon.com, ip: 209.85.210.174, mailfrom: bret@corthon.com) Received: by mail-pf1-f174.google.com with SMTP id u33so99361pfg.8 for ; Tue, 02 Nov 2021 13:21:54 -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=TYPkmQYxzw37fezREFy4YzSDLYvqlllPY9WZwkwf4VA=; b=bGlId/xkTk8FD9d/S1Uv6QvIU2gIiK9srBxFvzQJ5aOqM+TGVJp59Ro1dBQSL+puzs Bk1meivXHeShDss2rm1wEjladNSLtnQUnLT/VJ66sTqr0Z35FUskSG7iWDbT2rp11p6R qHP8f62fyMdjDi9IkvjyFWoM+jjLo5uwNm4WrAXvvS2szf5l//KB1HpFFvk6KFa/Gwfn mXsUYmgOOTXgLa82ViWdzqXWXo1p9GWnrT0og5htn6sPiLh4WwyxB8n1uBP76nkw5u50 9G6TJJRtcRd2qFEUB+zy1jTaEjN1kXzIfUtceyd9RJYBzDFSjhbyClTkO3/J40mUSRI4 bmjg== 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=TYPkmQYxzw37fezREFy4YzSDLYvqlllPY9WZwkwf4VA=; b=QX9clImGhIRZee0nAVytYQaFJB00GQOKfitpMRuJc4f1YX8ZyzYQT1586GZbhiu5hM 3+6moo3gwDpLWhT9RkgjszfGlefdCCAcQEkoKoEM62XLQoa0EesfR8DoV7nx7NUK42pl SQ0OlNrRzjLfFrmNN8InKhgdWeKOyLlD1bUmESJIpXln5PKCMseXd5E0QW2y/8XC4yoh G6ZvYokc4fP4MF4oDnul1cpffCYi4RVbJcCr2tluwDkUAMvioczfWEdTcoLEg4lXEiRc jYvaCiLYfVCXPgX9b1J3FTjXqxsCTsb17hEYhCn+WMseSTq/S9LCr5GkKr/BtxuPTyM2 GXkA== X-Gm-Message-State: AOAM532ajeqFwPHNeeMK9bDZGWuWbYomRHqnc5ca0wKSoacEesZf62m/ nQbHwCqqS+/cqJofCACA7nfHuqi6hTJqxQ0a X-Google-Smtp-Source: ABdhPJy8HmBCb+TtTFmyqFpM3M7ElbKOAhNYkO/wfytMXRbI0YitAH4jmXBkMRRdt2Ds2KbGfzh/Kw== X-Received: by 2002:a62:31c5:0:b0:447:b30c:9a79 with SMTP id x188-20020a6231c5000000b00447b30c9a79mr39598960pfx.67.1635884513741; Tue, 02 Nov 2021 13:21:53 -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 t24sm17652pfg.118.2021.11.02.13.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:21:53 -0700 (PDT) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Sean Brogan Subject: [PATCH v2 14/16] ArmPkg/Library: Convert StandaloneMmCoreEntryPoint to Arm-only Date: Tue, 2 Nov 2021 13:17:46 -0700 Message-Id: <20211102201748.1963-15-brbarkel@microsoft.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh 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