From nobody Tue Nov 26 01:59:48 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+61623+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+61623+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1592949418; cv=none; d=zohomail.com; s=zohoarc; b=e2kk1lE1VHwSrNM2h6CNWoubvi2+m8RrfQCPXGMv64f4wMtOLknVbcMIlrqU319Nd2qfyYDsKAOaZRAaXNwqMY6veO9pFkLdjbO8C29jiL9MRrDTNNc9NHQmrhuMF3EVRFHSRHhb/cDlEFQR1Kk0GPtdJsQlMGN4iWK2uXszWoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592949418; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=TR3otwwbqedAFF6QR/fSMXhuGm3L7PKJRjmChcSA950=; b=XlWtABgO90Fhvhfp2/43DBtC8diAuiCZmtaQov45lGBkcW/Sss1ygydUup5BaHGjROet++My9G+FJvqr2RtX1AWOK9u64bBiJo0LjEvWEQ3qlUyWEGmOMArf2ZZeJynA50Y9Ds/daKu3XSHBalBi1wP8aYk0pPloHPxaYsHtnAs= 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+61623+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1592949418561253.10451644260866; Tue, 23 Jun 2020 14:56:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WXWzYY1788612xEX1fnXcJBe; Tue, 23 Jun 2020 14:56:58 -0700 X-Received: from atlmailgw1.ami.com (atlmailgw1.ami.com []) by mx.groups.io with SMTP id smtpd.web11.544.1592949415158553916 for ; Tue, 23 Jun 2020 14:56:56 -0700 X-AuditID: ac1060b2-ed1ff70000003d78-98-5ef27aa7af46 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 04.46.15736.7AA72FE5; Tue, 23 Jun 2020 17:56:55 -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; Tue, 23 Jun 2020 17:56:01 -0400 From: "Oleksiy Yakovlev" To: CC: , , , , , , , Subject: [edk2-devel] [PATCH V2 3/3] UefiCpuPkg: Add New Memory Attributes Date: Tue, 23 Jun 2020 17:55:56 -0400 Message-ID: <20200623215556.80804-4-oleksiyy@ami.com> In-Reply-To: <20200623215556.80804-1-oleksiyy@ami.com> References: <20200623215556.80804-1-oleksiyy@ami.com> MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsWyRiBhgu7yqk9xBhfnyVps3aZu0T5hNpvF smM7WCxW3NvAbtHR8Y/JYvp2F4svq98zOrB7bP9+gdFj8Z6XTB7v911lC2COamC0SczLyy9J LElVSEktTrZVCijKLEtMrlRSyEyxVTJUUijISUxOzU3NK7FVSiwoSM1LUbLjUsAANkBlmXkK qXnJ+SmZeem2Sp7B/roWFqaWuoZKdiEZqQqZeWn5RbmJJZn5eQrJ+XklQNWpKUBRhYRuzow1 k96xFzRrVPzdfIylgXGTbBcjJ4eEgInE5FnnmboYuTiEBHYxSeyZ1MsG4WxhlHh5/SQrSBWb gKbEgWNTGEFsEQEpiSkHZoJ1MAvsYZToeX0KqIiDQ1jAVuLdXDaQGhYBVYnf89Yxg9i8AqYS yze3skBs05CYtuYuE0g5p4CZxPOXASBhIaCS9tX3mCDKBSVOznwCVs4sICFx8MULZogaWYm2 48/ZJzDyz0JSNgtJ2QJGplWMQoklObmJmTnp5YZ6ibmZesn5uZsYIZG4aQdjy0XzQ4xMHIyH GCU4mJVEeEPcPsUJ8aYkVlalFuXHF5XmpBYfYnQCun8isxQ3KACBMRJvbGAgJQrjGJqYmZgb mRtampgbGyuJ805euyZOSCAdGLPZqakFqUUwQ5g4OKUaGFcmhH3WqjHJc1yr/jFMgOdu3HEf 5md7Fls+Nynd1HzTL8o0f3HR1MNcmy58DNA8wts4vf2qAq9g/475ycIyeqePTHjw6nzMuidz FLxeiDLOzGx7t7Htuoh8o63P+306X/IX7rVeyr/Uvzbx47ak8Khi3hd/XScYacUqf93aLMQU Vd6R99XfTomlOCPRUIu5qDgRAF/OITXZAgAA 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: d1ay7Hl61VMbLdHKySzxlzvOx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1592949418; bh=mnbmsBmFdvHqeS0znalmYuI2Vyi0/C2NShvDPeH23sA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=YFF2W9Tm2+hdk1a/wPBvl9tLk8WZBuq3c2hQ8FGWFd4IjMqIEhfkCuFBG/foZMqNM2/ Bx66KQR6uhzb3xZfmZqhmhRlNCYyrfhiEWXYTPmNeA+mfh2rYg5gLTPUrsSiW5vX8+Oot uL5FahVmWFi40GVeGV99Q+5FHquUfFtoUhM= 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). Use attributes bitmasks, defined in MdePkg. Signed-off-by: Oleksiy Yakovlev Reviewed-by: Laszlo Ersek --- UefiCpuPkg/CpuDxe/CpuDxe.c | 11 ++++------- UefiCpuPkg/CpuDxe/CpuDxe.h | 12 ------------ UefiCpuPkg/CpuDxe/CpuPageTable.c | 6 +++--- UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 2 +- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.c b/UefiCpuPkg/CpuDxe/CpuDxe.c index a571fc3..52cc26e 100644 --- a/UefiCpuPkg/CpuDxe/CpuDxe.c +++ b/UefiCpuPkg/CpuDxe/CpuDxe.c @@ -10,9 +10,6 @@ #include "CpuMp.h" #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) - // // Global Variables // @@ -417,8 +414,8 @@ CpuSetMemoryAttributes ( return EFI_SUCCESS; } =20 - CacheAttributes =3D Attributes & CACHE_ATTRIBUTE_MASK; - MemoryAttributes =3D Attributes & MEMORY_ATTRIBUTE_MASK; + CacheAttributes =3D Attributes & EFI_CACHE_ATTRIBUTE_MASK; + MemoryAttributes =3D Attributes & EFI_MEMORY_ATTRIBUTE_MASK; =20 if (Attributes !=3D (CacheAttributes | MemoryAttributes)) { return EFI_INVALID_PARAMETER; @@ -677,7 +674,7 @@ SetGcdMemorySpaceAttributes ( gDS->SetMemorySpaceAttributes ( RegionStart, RegionLength, - (MemorySpaceMap[Index].Attributes & ~EFI_MEMORY_CACHETYPE_MASK)= | (MemorySpaceMap[Index].Capabilities & Attributes) + (MemorySpaceMap[Index].Attributes & ~EFI_CACHE_ATTRIBUTE_MASK) = | (MemorySpaceMap[Index].Capabilities & Attributes) ); } =20 @@ -754,7 +751,7 @@ RefreshMemoryAttributesFromMtrr ( gDS->SetMemorySpaceAttributes ( MemorySpaceMap[Index].BaseAddress, MemorySpaceMap[Index].Length, - (MemorySpaceMap[Index].Attributes & ~EFI_MEMORY_CACHETYPE_MASK)= | + (MemorySpaceMap[Index].Attributes & ~EFI_CACHE_ATTRIBUTE_MASK) | (MemorySpaceMap[Index].Capabilities & DefaultAttributes) ); } diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.h b/UefiCpuPkg/CpuDxe/CpuDxe.h index 9299eaa..9771ec8 100644 --- a/UefiCpuPkg/CpuDxe/CpuDxe.h +++ b/UefiCpuPkg/CpuDxe/CpuDxe.h @@ -39,18 +39,6 @@ #include #include =20 -#define EFI_MEMORY_CACHETYPE_MASK (EFI_MEMORY_UC | \ - EFI_MEMORY_WC | \ - EFI_MEMORY_WT | \ - EFI_MEMORY_WB | \ - EFI_MEMORY_UCE \ - ) - -#define EFI_MEMORY_PAGETYPE_MASK (EFI_MEMORY_RP | \ - EFI_MEMORY_XP | \ - EFI_MEMORY_RO \ - ) - #define HEAP_GUARD_NONSTOP_MODE \ ((PcdGet8 (PcdHeapGuardPropertyMask) & (BIT6|BIT4|BIT1|BIT0)) > BI= T6) =20 diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/UefiCpuPkg/CpuDxe/CpuPageTa= ble.c index 0a02cb3..06ee1b8 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_ATTRIBUTE_MASK) !=3D 0) { DEBUG ((DEBUG_ERROR, "Attributes(0x%lx) has unsupported bit\n", Attrib= utes)); return EFI_UNSUPPORTED; } @@ -1018,9 +1018,9 @@ RefreshGcdMemoryAttributesFromPaging ( =20 Length =3D MIN (PageLength, MemorySpaceLength); if (Attributes !=3D (MemorySpaceMap[Index].Attributes & - EFI_MEMORY_PAGETYPE_MASK)) { + EFI_MEMORY_ATTRIBUTE_MASK)) { NewAttributes =3D (MemorySpaceMap[Index].Attributes & - ~EFI_MEMORY_PAGETYPE_MASK) | Attributes; + ~EFI_MEMORY_ATTRIBUTE_MASK) | Attributes; Status =3D gDS->SetMemorySpaceAttributes ( BaseAddress, Length, diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPk= g/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c index 9c5a92a..ebfc46a 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_ATTRIBUTE_MASK) =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 (#61623): https://edk2.groups.io/g/devel/message/61623 Mute This Topic: https://groups.io/mt/75070223/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-