From nobody Sun May 5 11:20:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+61312+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61312+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1592257641; cv=none; d=zohomail.com; s=zohoarc; b=SBolJWYkfiLk4362pejOyYdXGjuOy3HsCkIGWJ9xQvujNTCIAIm7kzquHH/AdsGDHBxR07Db/ZxGNSqwe1zc+aBlXZUSp94j2mDxW2UB1rb5HB2g9OYfbz7tBCs+02m6Ufh9UtlsixiWnvqp3rX8y7bSENgzSyKTwFcjgeuT8VQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592257641; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=K+Un7ZT9ugShhWQzaPPb/DPVUz2XnvRKBFEZ/Z0OtUc=; b=CwOTLTX0dKTjTjT9eG6qnKXgeWqXic42a7Xu9Bx8md2/mdk/BFdIDjmOto+yF2DjR6CGAS0fjo0u/Uu8ytW5r7yp3wFm+enH1/ND01b0KIQ9vscuszjrW0lGjLVUiv6lnddScLNc/Sb4ep8eWGSiJsa9Edn25oozFOE8xSYoFNc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61312+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1592257640995305.46946538081545; Mon, 15 Jun 2020 14:47:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id G43XYY1788612xmZGziZs5AD; Mon, 15 Jun 2020 14:47:20 -0700 X-Received: from atlmailgw1.ami.com (atlmailgw1.ami.com [63.147.10.40]) by mx.groups.io with SMTP id smtpd.web10.183.1592257638849958314 for ; Mon, 15 Jun 2020 14:47:19 -0700 X-AuditID: ac1060b2-ebbff70000003d78-35-5ee7ec65f0d4 X-Received: from atlms1.us.megatrends.com (atlms1.us.megatrends.com [172.16.96.144]) (using TLS with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (Client did not present a certificate) by atlmailgw1.ami.com (Symantec Messaging Gateway) with SMTP id A3.9B.15736.56CE7EE5; Mon, 15 Jun 2020 17:47:18 -0400 (EDT) X-Received: from Oleksiy77.us.megatrends.com (172.16.97.158) by atlms1.us.megatrends.com (172.16.96.144) with Microsoft SMTP Server id 14.3.468.0; Mon, 15 Jun 2020 17:45:48 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , Subject: [edk2-devel] [PATCH] UefiCpuPkg: Add New Memory Attributes Date: Mon, 15 Jun 2020 17:45:48 -0400 Message-ID: <20200615214548.43792-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsWyRiBhgm7am+dxBkueM1m0T5jNZrH5RbDF smM7WCymb3ex+LL6PaMDq8f27xcYPRbvecnk8X7fVbYA5qgGRpvEvLz8ksSSVIWU1OJkW6WA osyyxORKJYXMFFslQyWFgpzE5NTc1LwSW6XEgoLUvBQlOy4FDGADVJaZp5Cal5yfkpmXbqvk Geyva2FhaqlrqGQXkpGqkJmXll+Um1iSmZ+nkJyfVwJUnZoCFFVI6ObM2L5gIUvBe/GKdasu MjYwThHqYuTkkBAwkXg0bzEjiC0ksItJYtaXrC5GLiB7C6PEkcc7wBJsApoSB45NAbNFBKQk phyYyQRSxCzQwigxq3EuWEJYwExiztZTbCA2i4CqxP/375lBbF4BU4kjRxezQmzTkJi25i4T RFxQ4uTMJywgNrOAhMTBFy+YIa6QlWg7/px9AiPvLCRls5CULWBkWsUolFiSk5uYmZNebqiX mJupl5yfu4kREkebdjC2XDQ/xMjEwXiIUYKDWUmE95D88zgh3pTEyqrUovz4otKc1OJDjE5A h05kluIGhRQw6OONDQykRGEcQxMzE3Mjc0NLE3NjYyVx3slr18QJCaQDozA7NbUgtQhmCBMH p1QD47XNHz13R3x/0sy3te5U5yGDKVf1nY63mkYI6AhtKfZiOGCdEszU3/NCVUzjzetcwaJz Dw5u+fj0mmLtvxufT14WZZHeEtj90OYrpyPP2orqjrdV6b9Ov+HiZ+PZZC6TmdJy9OyDY+2H LbdUcrxLUVJ+uunitCXsVZtulxR7BHyILzn/4Obm+0osxRmJhlrMRcWJAKiFl1K4AgAA Precedence: Bulk List-Unsubscribe: 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,oleksiyy@ami.com X-Gm-Message-State: ngoJCt05pIiHlHSwqFT0emR3x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1592257640; bh=pyGz9gKFP+YQEB9M0ebjWF1pkdj3x20JydQJWAf881U=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=swljVOagganjdUs1FN0otB0mMR5ut+IawflWrIgayxNmOhtl4cTbYEtCN4MWVO1x61X 1Z64JZ+Q4Wvh3p3ux8aUPS12hImN6vCqWe5IcWdvfYagIE30zvMmrxHVlL/bYsw17Z4qP Kq8pN/qjP+/oVnr+X2S+wIuNmM6wBS59OK0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add usage of EFI_MEMORY_SP and EFI_MEMORY_CPU_CRYPTO attributes introduced in UEFI 2.8 (UEFI 2.8, mantis 1919 and 1872) Signed-off-by: Oleksiy Yakovlev --- UefiCpuPkg/CpuDxe/CpuDxe.c | 2 +- UefiCpuPkg/CpuDxe/CpuDxe.h | 4 +++- UefiCpuPkg/CpuDxe/CpuPageTable.c | 2 +- UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/UefiCpuPkg/CpuDxe/CpuDxe.c index a571fc3..55ca764 100644 --- a/UefiCpuPkg/CpuDxe/CpuDxe.c +++ b/UefiCpuPkg/CpuDxe/CpuDxe.c @@ -11,7 +11,7 @@ #include "CpuPageTable.h" =20 #define CACHE_ATTRIBUTE_MASK (EFI_MEMORY_UC | EFI_MEMORY_WC | EFI_MEMORY= _WT | EFI_MEMORY_WB | EFI_MEMORY_UCE | EFI_MEMORY_WP) -#define MEMORY_ATTRIBUTE_MASK (EFI_MEMORY_RP | EFI_MEMORY_XP | EFI_MEMORY= _RO) +#define MEMORY_ATTRIBUTE_MASK (EFI_MEMORY_RP | EFI_MEMORY_XP | EFI_MEMORY= _RO | EFI_MEMORY_SP | EFI_MEMORY_CPU_CRYPTO) =20 // // Global Variables diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.h b/UefiCpuPkg/CpuDxe/CpuDxe.h index 9299eaa..37fb38e 100644 --- a/UefiCpuPkg/CpuDxe/CpuDxe.h +++ b/UefiCpuPkg/CpuDxe/CpuDxe.h @@ -48,7 +48,9 @@ =20 #define EFI_MEMORY_PAGETYPE_MASK (EFI_MEMORY_RP | \ EFI_MEMORY_XP | \ - EFI_MEMORY_RO \ + EFI_MEMORY_RO | \ + EFI_MEMORY_SP | \ + EFI_MEMORY_CPU_CRYPTO \ ) =20 #define HEAP_GUARD_NONSTOP_MODE \ diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/UefiCpuPkg/CpuDxe/CpuPageTa= ble.c index 0a02cb3..d769e4a 100644 --- a/UefiCpuPkg/CpuDxe/CpuPageTable.c +++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c @@ -717,7 +717,7 @@ ConvertMemoryPageAttributes ( return RETURN_INVALID_PARAMETER; } =20 - if ((Attributes & ~(EFI_MEMORY_RP | EFI_MEMORY_RO | EFI_MEMORY_XP)) !=3D= 0) { + if ((Attributes & ~(EFI_MEMORY_RP | EFI_MEMORY_RO | EFI_MEMORY_XP | EFI_= MEMORY_SP | EFI_MEMORY_CPU_CRYPTO)) !=3D 0) { DEBUG ((DEBUG_ERROR, "Attributes(0x%lx) has unsupported bit\n", Attrib= utes)); return EFI_UNSUPPORTED; } diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPk= g/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c index 9c5a92a..94adf37 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c @@ -435,7 +435,7 @@ ConvertMemoryPageAttributes ( EFI_PHYSICAL_ADDRESS MaximumSupportMemAddress; =20 ASSERT (Attributes !=3D 0); - ASSERT ((Attributes & ~(EFI_MEMORY_RP | EFI_MEMORY_RO | EFI_MEMORY_XP)) = =3D=3D 0); + ASSERT ((Attributes & ~(EFI_MEMORY_RP | EFI_MEMORY_RO | EFI_MEMORY_XP | = EFI_MEMORY_SP | EFI_MEMORY_CPU_CRYPTO)) =3D=3D 0); =20 ASSERT ((BaseAddress & (SIZE_4KB - 1)) =3D=3D 0); ASSERT ((Length & (SIZE_4KB - 1)) =3D=3D 0); --=20 2.9.0.windows.1 Please consider the environment before printing this email. The information contained in this message may be confidential and proprieta= ry to American Megatrends (AMI). This communication is intended to be read= only by the individual or entity to whom it is addressed or by their desig= nee. If the reader of this message is not the intended recipient, you are o= n notice that any distribution of this message, in any form, is strictly pr= ohibited. Please promptly notify the sender by reply e-mail or by telephon= e at 770-246-8600, and then delete or destroy all copies of the transmissio= n. -=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 (#61312): https://edk2.groups.io/g/devel/message/61312 Mute This Topic: https://groups.io/mt/74904942/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-