From nobody Mon Feb 9 07:23:35 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+83622+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+83622+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590355; cv=none; d=zohomail.com; s=zohoarc; b=haA9Vm1gBYpG3ti+e863CMj2XWzLwSLHoZCbYcjmLER4x7J9UWo8YzAc5yqtDgZwfFWT0MAsUTIR4CTY1x7ZTwgZuvomquKcsA1/wIb7EiBWy39YPTB7Tfe8Ivo2kiTAnkABqt3FtnS/eTevgMLrYIkmsqYau80/sSN2+FKtefc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590355; 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=1AZYkpCwPYP4Rwf8RZK27Z7/+ThdYSCVYJXiApCg69w=; b=BD+zzSe6dVNVqjDVO2FyHtTom46yWHDr/+yZbtCBAmw9d9jSludpPVYKuEYXAXsPJFl5jceIsWqkZXTgmGa/MGesxAWAe3TnG5h7Vc9Ki7KodbElIYUq42dTdWl84BojcmhLBG+3m4ixipLUtQPQfHSRJko1b8A1OQ2hnq1538c= 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+83622+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590355668985.1246781615256; Wed, 10 Nov 2021 16:25:55 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Qv1OYY1788612xIwIZUOGXjk; Wed, 10 Nov 2021 16:25:55 -0800 X-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 X-Received: by mail-pj1-f42.google.com with SMTP id fv9-20020a17090b0e8900b001a6a5ab1392so3273417pjb.1 for ; Wed, 10 Nov 2021 16:25:41 -0800 (PST) X-Gm-Message-State: 9loS6Vxut871UMDdIDaE9ZyQx1787277AA= 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) 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.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: [edk2-devel] [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> 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=1636590355; bh=XtyeKLxqj5jppHeGdVntj1W83i6j4VyMs/7vpbfwicI=; h=Cc:Date:From:Reply-To:Subject:To; b=Zd1RiE8F0ljOgnldazrGag3p6u7TvHvq/xJN2fbi7ZaMUAYjPa1J/KeHTUX3CvXUVSd pp84Tya3OWlhPBq3V3ZH2bIEqsPWA101eiWbOer1IsOG7uysGpsojXqE9qWfPnKgUc2Fn Q8uNEYH32rPBKOQyv18G6BS7yKRxZ0LrcT4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590356949100005 Content-Type: text/plain; charset="utf-8" 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 =20 #include "DxeIpl.h" =20 -#include +#include =20 /** Transfers control to DxeCore. @@ -40,7 +40,7 @@ HandOffToDxeCore ( ASSERT (BaseOfStack !=3D NULL); =20 if (PcdGetBool (PcdSetNxForStack)) { - Status =3D ArmSetMemoryRegionNoExec ((UINTN)BaseOfStack, STACK_SIZE); + Status =3D MmuSetAttributes ((UINTN)BaseOfStack, STACK_SIZE, EFI_MEMOR= Y_XP); ASSERT_EFI_ERROR (Status); } =20 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 MdeModulePkg/MdeModulePkg.dec =20 -[Packages.ARM, Packages.AARCH64] - ArmPkg/ArmPkg.dec =20 [LibraryClasses] PcdLib @@ -77,7 +75,7 @@ [LibraryClasses] PerformanceLib =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - ArmMmuLib + MmuLib =20 [Ppis] gEfiDxeIplPpiGuid ## PRODUCES 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 VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/Var= iablePolicyHelperLib.inf MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibN= ull.inf + MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf =20 [LibraryClasses.EBC.PEIM] IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf @@ -174,8 +175,6 @@ [LibraryClasses.common.MM_STANDALONE] MemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf - ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf =20 # --=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 (#83622): https://edk2.groups.io/g/devel/message/83622 Mute This Topic: https://groups.io/mt/86971570/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-