From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web08.4023.1636590341940675068 for ; Wed, 10 Nov 2021 16:25:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@corthon-com.20210112.gappssmtp.com header.s=20210112 header.b=niLq9gQz; spf=none, err=permanent DNS error (domain: corthon.com, ip: 209.85.216.42, mailfrom: bret@corthon.com) Received: by mail-pj1-f42.google.com with SMTP id fv9-20020a17090b0e8900b001a6a5ab1392so3273417pjb.1 for ; Wed, 10 Nov 2021 16:25:41 -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=g+sZAkDs8SUE3AhGJJGeC0SJxZ3s0XSlcpgBR+W/GxI=; b=niLq9gQz1jg7I6HI1kD3zr9agwZB2b9QwjbLrVCHa9sHGO8V+2Iih/FoRX/CB6kMsh YNKifG6hxXfITWcJN0cqFRG0Db5/CWKHhrb1V9UMW9UVABr62B6vipEIA5KxZ/4OM8as 97x6acUmwkCgGdIwsY6ixyQDAExLLBfYmHAGHIkTo39aXVD420PtNuluxJN0htuNKrMO m4fzlz5LubFj3UOsbVY1AmVZ7sRzYo+oFzsrwhV85zkeY3UoIsgmXoE5jo2eC7IK2USo RLKG1bNdc7sRUAp8yY2nluJSI6ztHgjygpIeSYWYJOrG1sU3dHZ0yXEpFeBsFQaBlRD5 YCMQ== 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=g+sZAkDs8SUE3AhGJJGeC0SJxZ3s0XSlcpgBR+W/GxI=; b=yV0nxxNyDptVITzFhSnq+NEXN4Q7/Gldzcajnl/pBK+Amv21sETAw2+wbEJ26kc4MB Jj3lrXqXGGsxnME58PShKHbKON/dt6el5qvZDFC/vxHtl+X4O80S0cMvsoqEcxSKIm/r 3rpudcU8JqUoAVS/6sY0idBUD2QRY3n+3Psjyw6kax3PtQyA0xuH5zt54TenpYm+gl7q th5OBFAk/iB4koafkxcYFe4zIsPUQqsWv8IUMdW5oU4wDWo2eFbLnG8g2iukAKNK1L2R CBtdkLjhvGZ+y2746Rf8do+b0hyMArJr4n0SJx4zLq6+RggDnYS+AmTuBXAbcRZJqXcy /Fsw== X-Gm-Message-State: AOAM533ODQvLa1TZpBNoDzNrtzZxhdffq0m2szEfLaI3ovjsqUnE307c ud4dlWPhYYWcFdOPZ/wfMSCJVFroGIisUBdW X-Google-Smtp-Source: ABdhPJzJ2rHNq07QaI1gTemLlrVEuIe+7wmGCgvwlI91RVShUaCHcuh2WJZZeZoru53LT+7wY987yA== X-Received: by 2002:a17:902:d718:b0:13d:e2ec:1741 with SMTP id w24-20020a170902d71800b0013de2ec1741mr3449953ply.38.1636590341034; Wed, 10 Nov 2021 16:25:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:25:40 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Dandan Bi , Sean Brogan Subject: [PATCH v3 10/14] MdeModulePkg: Swap to MmuLib instead of Arm-specific lib Date: Wed, 10 Nov 2021 16:24:12 -0800 Message-Id: <20211111002416.1770-11-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 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3651 Cc: Jian J Wang Cc: Liming Gao Cc: Dandan Bi Cc: Liming Gao Cc: Sean Brogan Signed-off-by: Bret Barkelew --- MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c | 4 ++-- MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 4 +--- MdeModulePkg/MdeModulePkg.dsc | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c b/MdeModulePkg/= Core/DxeIplPeim/Arm/DxeLoadFunc.c index 6619a650661b..16c20930a662 100644 --- a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c +++ b/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c @@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =0D #include "DxeIpl.h"=0D =0D -#include =0D +#include =0D =0D /**=0D Transfers control to DxeCore.=0D @@ -40,7 +40,7 @@ HandOffToDxeCore ( ASSERT (BaseOfStack !=3D NULL);=0D =0D if (PcdGetBool (PcdSetNxForStack)) {=0D - Status =3D ArmSetMemoryRegionNoExec ((UINTN)BaseOfStack, STACK_SIZE);= =0D + Status =3D MmuSetAttributes ((UINTN)BaseOfStack, STACK_SIZE, EFI_MEMOR= Y_XP);=0D ASSERT_EFI_ERROR (Status);=0D }=0D =0D diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/Dx= eIplPeim/DxeIpl.inf index 19b8a4c8aefa..3634d836548f 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf @@ -57,8 +57,6 @@ [Packages] MdePkg/MdePkg.dec=0D MdeModulePkg/MdeModulePkg.dec=0D =0D -[Packages.ARM, Packages.AARCH64]=0D - ArmPkg/ArmPkg.dec=0D =0D [LibraryClasses]=0D PcdLib=0D @@ -77,7 +75,7 @@ [LibraryClasses] PerformanceLib=0D =0D [LibraryClasses.ARM, LibraryClasses.AARCH64]=0D - ArmMmuLib=0D + MmuLib=0D =0D [Ppis]=0D gEfiDxeIplPpiGuid ## PRODUCES=0D diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index e3146c378800..1530ea6796da 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -103,6 +103,7 @@ [LibraryClasses] DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGr= aphics/DisplayUpdateProgressLibGraphics.inf=0D VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/Var= iablePolicyHelperLib.inf=0D MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibN= ull.inf=0D + MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf=0D =0D [LibraryClasses.EBC.PEIM]=0D IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf=0D @@ -174,8 +175,6 @@ [LibraryClasses.common.MM_STANDALONE] MemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf= =0D =0D [LibraryClasses.ARM, LibraryClasses.AARCH64]=0D - ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf=0D - ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf=0D LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf=0D =0D #=0D --=20 2.31.1.windows.1