From nobody Sun Apr 28 14:40:41 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1488497779674751.2559284312875; Thu, 2 Mar 2017 15:36:19 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6C9B8821FF; Thu, 2 Mar 2017 15:36:17 -0800 (PST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::614]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A3FE8821FB for ; Thu, 2 Mar 2017 15:36:15 -0800 (PST) Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by MWHPR12MB1248.namprd12.prod.outlook.com (10.169.205.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Thu, 2 Mar 2017 23:36:13 +0000 X-Original-To: edk2-devel@ml01.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=zAhcLvqkmUVnPa+yHima/IWgEslZhoBDQN4QzDi5q2E=; b=Dy/wtvhhZQRJgOeHZPGehAVj0H41JDr5X6dZeTbeczaQiCmGEQ+PXOqVZ3L7Z3AXxnUwmq2bB1nRnsxI+WZ3Lblb5PJhJQRwUPbjCr6sl+ueWvenFxInQx+LnbMRabt5Aux9Fcw8TPy0f7Hmvy8T/nF3s8LEl1ngFFlUYwpWwoY= Authentication-Results: ml01.01.org; dkim=none (message not signed) header.d=none;ml01.01.org; dmarc=none action=none header.from=amd.com; From: Leo Duran To: Date: Thu, 2 Mar 2017 17:36:03 -0600 Message-ID: <1488497763-10435-2-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488497763-10435-1-git-send-email-leo.duran@amd.com> References: <1488497763-10435-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR07CA0020.namprd07.prod.outlook.com (10.172.94.30) To MWHPR12MB1248.namprd12.prod.outlook.com (10.169.205.8) X-MS-Office365-Filtering-Correlation-Id: 85b01236-c489-4176-0a7b-08d461c4ea94 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:MWHPR12MB1248; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1248; 3:BX6NEX1Cx2E2TtITidKVMu9kHorvKDlYMwAAK+oD+Sy0K5I61FYp+37h0U4DdUJ16xcMIofilz0m7fw8KSv1mJu7I7Vy4DiSPObzJOTM0Csw5vEKtfWeRPdwBccWghyjgFo+xU7yPlfv9NCoHNww5pG0LSF+ahCwnQfCczAn2ZiHtRUZo1o/r82dcXmPYf2bmw0Rn4woGeNGhuorLdnbGJy0cwjkWNpB5jASt07X/HhT5k9CdLy2jb99fyTSaTn4ULXPnT9gslewcJfoZjbyueNl0Zmk5HMql/o2RHI/tfc=; 25:Gc8uuJJ3WiOAClHgG9H3wSEQPWKigCYVMN4yODnRgu3LrrN6UizWBaHfX0sCQI5wAx999faca8SJKyTGn8Eqmc4TyjzKKP0CWkkLOX2sWlKqOc56elB//AMXv2UXZld3osYwOOSHEkyQCMU7ZGXGzmp7GV9Exo9aBauzcAXCG2Yb82zZmaQDrKigkWx8ZHnhfS1e9OL7QYzdwFXm9PwpKFvxUZ1zxM9NJ9K0Yq0IugxoyyGmLsr+7rpmxYAJdMqhyjZ9bXqmPb02KcuvTAv+WMdFV23tnNxb8WgN681L8Mla6+/m/Ul2BAy9uxJE0lAB456PC4RTlNSvP9+7ppe+jQxQdm9nzJ85w6d4AOsMC6EwZW1zKJpm9Rr6WHAt/iqQTruLou9RWr0ZdD3n4oMeoYgxltTiYACgtpgwzEw08kJ1jlcE3SgF2vVbDvqwkAGqC4PsA3/1vFMKINnnnsRn8Q== X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1248; 31:8O8Rg2uwb2lbsKHQsfSX04oXCPuFDks9wFfIjAqxibr5ybUW6IU+B1edkq3Ixoc5Vt5PPkQSHDQhIV2fxzMWxuE//BLgjTfwZXG821OTY2ZhxfO3Mijp4XG+Dn27t8CbAm14HVC5x/GjJFDenP8GiJg35n7excKcR6kT8yrCGJqdNddmh6EbzER0Az3w8ow5M7YhPnTn3AyJtr6dh8fJVXr4XDkaM9/F80OGZRFueTTSRsAlHHeJs4FEIeYC9u1K; 20:woGnfWkQXtB6vc0ik/adek6mUnb4tnzPQwP36Ro287uzo/1TB8DKeokWVBN34whD0/G3dh6Qc+IJeQjm2n2fH+gJSFZMaAorFqONrkQxieX1SWJj3J0TZo45F/JobX3IlODdOpqLz23dikqZczEwvbD5vIBoJnBfqRkrYFLwCpXUEZKnZ/YERCY/LO8ABkQW1Ng3JishiJWVDoJ602PVVcrPezIRfadagy/P/l3cXLT4PC1KQH+CqjlI1RVGwTPcl1RaiPnVU3VXJ7djX/VrQArxPzqgfUeDvJ1B4UdfKKIKWBIBS8MvGDwHcjvHXDgpJbybYyoTL8lYYjltPVrVZ14wCGxCNlO1Su6NyBMNGUV9WJqSTPum1fY5tZXOARNmxSjETzRoJlU8GdPPfcJPIa/naD7P/fWoxlqztRGK6BIGH/+oC7FkKzvDZjF/IfGhUSIY2fgfxSiPSlndFCmIarz8PktEasXu7cHyHq1P8nEoU8kxGL0SVE0M5LxMw4f+ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123555025)(20161123562025)(20161123564025)(20161123558025)(20161123560025)(6072148); SRVR:MWHPR12MB1248; BCL:0; PCL:0; RULEID:; SRVR:MWHPR12MB1248; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1248; 4:cv3sFT3jCrdoBS8EzzFt02WGWW+zgnYAaPyWAhehtPfKdcFxNanf+Jj8bYmsO5C91ZQ+DHgI0Nx1EeUqYOn9+QFU8IK4Pri8dW4m75tTsrY+9tKpI3bDaM7BWfxAKoQzrNMwlHlIKtDSETyqsUwJCe9CF0bkk1FN0ecO1wmiAWO9I4Cyu23ts3qCvjTIl9CBusZ2xdWFV2Yh4XFR73M3k8OoOiXgx52MG2YpbKafAv6a2nC+KO450U18lIM9D47QwX6SrsUrb3RDGsp6nbHyGoX+kSVkKb09cHB2Y4mUR9lDmfsI69VjDFeaayoNTtseuEqvotqZHIkPZkp1xka2MvBFxEiW6Pm1mTBq7QZesbVV/3ZTtmrtAAhxefbdmY/wayXhp1Cu90tbOf5/nOrsMUjF4yAnadPze6BmscGgi6yIoaWAK5f6X3koR10ZmwHw+3Gt0Zj+3PPKf6Th6X7l76ajAjYfo2p3PwyXmVdByenUJCXKhENkbCdr9xlz5j8v/zXPiCePHFemaXPlI6I5C6F7+UTOASd3DrXQkE7TnG/+zms6M8qurWlRe5hgu8zfnHrgiZcijkFkzVpyDypxgbhWnRIaXoiItBPMepYGsUMTME9weMmGjmsaYZgaIyxY91NBQAwEu264pubutx/NsfgNgvjvu778hDoB9aWSwwTZo36gL5/vH3J7qRK3Pfrr X-Forefront-PRVS: 023495660C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39450400003)(39860400002)(39410400002)(39850400002)(39840400002)(81166006)(86362001)(25786008)(3846002)(6916009)(6116002)(50226002)(53936002)(2950100002)(36756003)(4326008)(5660300001)(6666003)(6486002)(8676002)(50986999)(110136004)(47776003)(7736002)(53416004)(54906002)(76176999)(2351001)(189998001)(42186005)(92566002)(305945005)(48376002)(38730400002)(33646002)(66066001)(50466002)(2906002)(5003940100001)(213903007)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1248; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR12MB1248; 23:dU24FMF5ZWfS0sEBdcRvP9kvEtiH2a2aRNy/lR1ll?= =?us-ascii?Q?lbfOoakJL8fa7EYuSxbgm+RykYf6OXOq5qzEey7jHlyAu7PujxMLL8u+RX6/?= =?us-ascii?Q?gtTwxkxCZl+rSFFZIE+gPCE8N65rOQr3m1V1IjRzUhWfTNTV5E3cHMuRmUpK?= =?us-ascii?Q?xJCOaq+FZmrRGKCy+KZCb2SUMqOhdOx18Pho9y+hducEAlTFn+GdY3p+nSAg?= =?us-ascii?Q?R4d/SUx+cRGkRony2LdNJxkwpjROBUlMlLny9TO1+0kKwT6Al37RpJh2US7z?= =?us-ascii?Q?86OwS5kgCjDXyhXLPXaxczZeH4Z2i9XuMo2N+ex19OHtLKoNVI2+aKEue4nt?= =?us-ascii?Q?RyZzAR04SLqt14+wdqXO2bkH68q7aCtQ59Pbtw0faemWKrFZYxbfTdXIYPeH?= =?us-ascii?Q?RW7Zfl8InJd2tNtJfZ8qejFcwjeZbqzywQLjxprF21rWOMtza9SJq0ekgUyL?= =?us-ascii?Q?BhwFVVb410W5F7n/lBIPPemJD2q/9uJUbQWNGyt3myrIOK+u8md1+p7XSa8H?= =?us-ascii?Q?jVe3b4Lnr4VEO/Lm3JFTZZTdBRJ5Z93R18Oh0e+5Y558eH7OBniwGrNpQhPD?= =?us-ascii?Q?Ybs+FbbJwNhbemTH6EiLHMxzI9np3unv7QPyWnj/dqvIi7DFtAwSc19HybH9?= =?us-ascii?Q?EtTod+080sHJqqHRopMyE48a0aN1PSymZPkAvV1yuhazD9ZC5CekmguhyQVY?= =?us-ascii?Q?lfVQCjp6FF0tLWYTkzuWmr/Qv3yM9OUGnsF5KiiivKiwe+YplE/sTMEbez7S?= =?us-ascii?Q?U3q0U8yVhkArf+h9QD6JvRHxd8YDixARdYfihqGnCMY+6YOPWf/+myzRgn5b?= =?us-ascii?Q?XtojFVFcu/8mEW9tNtteZVNTMboKL7ZwfEXCUEzxDE0JgVE12w6Vw3ozcFJr?= =?us-ascii?Q?HQ8B28z5OVnOO4VoNQHdxnUZRXdxmAmUoiQn0i/qRVT0azUrKr7y4cMQAtLC?= =?us-ascii?Q?kvYgIzF4CYxI487bpUVt0HX/z9N7zXWPVjbBd/rDBr0oTUu/WfdFFkMAWSDf?= =?us-ascii?Q?wYrwVeCjvKjVcKkC2myCDq3W4CDmX5GnbrOj1AybJ9hMCKFqLJ0aS42nqYz6?= =?us-ascii?Q?+D7Th7fYvWJSm4DRxsERYxOCVFvtvxAMCLyC3KL1wtPMAg4NpPt2zU7crO0g?= =?us-ascii?Q?JxLow63ElWq+BjrexYHy7F8Z/62nmEa?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1248; 6:7qKIxGkiTDmFgaPzLEnYjbxShn7P7hR3oNkEPhm/JMnWWo2nxst+KOthpSoH65wP6WU+ZtMi/KWlIN7o9yAn7Ichwk4SEU9qjdwT6oXW5htT2eNTuIk365CAaOJwladdUHQXtbai/2/sDQcJoMha7ZFloy3Hsqdk9jv4Hl6R4qpEDfYN6dliuE1GmAru5EcwAkzqtZMQFN2iZ8c2XaHol89HtKGg8AihOJTKft+n1KMaKorRSp/LMFbxLD4cEcaCKIsGjDfHa0oOPHBUbgJWp/DDCHdKK9sPHBiRnw7EETisRYk2spS4Sv/PKoI6PAB0lkWr96HqQOGFr3HVaqwcQDWA+UhYO8b6wuq3jVnh8FnsSenk9meXlaMax0YrzhXzKqTFAEKlxx0MxkCrU9kqlzhOP+rW4PmSSCUVIIHUiNg=; 5:CVNva+xaOeQY1uOY+ErusCgFjnD7VVwxUTv8wzCxPCiVX+PA1TGnpmMJX5dOeIAFglKjFgsI6Cee9v40wdiSIRqB7Zxi1LhJ+T8eCPaRobxSoa/yuc46SrjXZodEamN4OTSBmqH/BsECaF9GqnZOMA==; 24:wCXpuNeJf227niGfJ4+rM06rw6KriHs4A25Y+koALiOoCeIuS2vJOPavoMDu9Xc7Jexm3lmwHkSoG1gYZ9AovQBABzJrWJGzzUGs2rqIVhg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1248; 7:53F0TqW0v65Nr5yg17LsRXeXr7/i9zeLNTZHXjRXe4hhz7+Cg/Bq/NpQhCsMrKy6findmW6gqZngWhdNY1+T2UiOS1s6hQkU3gCpa3h9AASBCHqEtJ1Yq7irFwXCwdpo7P6k8yt/cQ7pmgJ5XR0VjcOf5U4XNBD9sxcprtz/dKe6wHXW3WC7BlC6n6m4tgHDtgEwOcyQsruF3s2JaLTB/vUoXnzfBB5CBtxN/kc+vB0GIwOdr1dKUXrOqSlFvjR+1UCpiUYcEhle7tMKQoPeUe6s0PhAnUkJstLSHvwXq0BeDDMXJb3QtF9FwT8jyc3TEV0zXTSAgwYVuGVhUEw2GA==; 20://VDy7R13jKPjwSpy1PW6BnSIHNP5AQeS9v/FuBmhRMK48+bxlGMMru3dauZ6Cc7HEWDYr+7wihfaBVFGLCPVyhvUSzaSSEFmKBCF19WIfDGnSRfCNtnTLcab/Jo1HhHzAoUPG+zyiVUIIZ+WjhXMUbVNwM4JMSiaZHa26lV6QiFTgVOjop/lbcKiULtjfzz4lWEPKeZLkonhWQ1am+bG81YDFE/a3LgZ8FA758mzfcEn5dI7JpQ5cI5eSmLiOA5 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2017 23:36:13.8283 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1248 Subject: [edk2] [PATCH] UefiCpuPkg/CpuDxe: Add support for PCD PcdPteMemoryEncryptionAddressOrMask X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Feng Tian , Brijesh Singh , Leo Duran , Laszlo Ersek , Jeff Fan , Star Zeng Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This PCD holds the address mask for page table entries when memory encryption is enabled on AMD processors supporting the Secure Encrypted Virtualization (SEV) feature. The mask is applied when page tables entries are created or modified. CC: Jeff Fan Cc: Feng Tian Cc: Star Zeng Cc: Laszlo Ersek Cc: Brijesh Singh Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leo Duran Reviewed-by: Jeff Fan --- UefiCpuPkg/CpuDxe/CpuDxe.inf | 5 +++++ UefiCpuPkg/CpuDxe/CpuPageTable.c | 30 +++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf index e568ceb..ec535e8 100644 --- a/UefiCpuPkg/CpuDxe/CpuDxe.inf +++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf @@ -2,6 +2,8 @@ # CPU driver installs CPU Architecture Protocol and CPU MP protocol. # # Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2017, AMD Incorporated. All rights reserved.
+# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License # which accompanies this distribution. The full text of the license may = be found at @@ -77,6 +79,9 @@ gEfiSecPlatformInformation2PpiGuid ## UNDEFINED # HOB gEfiSecPlatformInformationPpiGuid ## UNDEFINED # HOB =20 + [Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask #= # CONSUMES + [Depex] TRUE =20 diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/UefiCpuPkg/CpuDxe/CpuPageTa= ble.c index 202d1d9..65f607a 100644 --- a/UefiCpuPkg/CpuDxe/CpuPageTable.c +++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c @@ -2,6 +2,8 @@ Page table management support. =20 Copyright (c) 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2017, AMD Incorporated. All rights reserved.
+ This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -271,6 +273,7 @@ GetPageTableEntry ( UINT64 *L2PageTable; UINT64 *L3PageTable; UINT64 *L4PageTable; + UINT64 AddressEncMask; =20 ASSERT (PagingContext !=3D NULL); =20 @@ -279,6 +282,10 @@ GetPageTableEntry ( Index2 =3D ((UINTN)Address >> 21) & PAGING_PAE_INDEX_MASK; Index1 =3D ((UINTN)Address >> 12) & PAGING_PAE_INDEX_MASK; =20 + // Make sure AddressEncMask is contained to smallest supported address f= ield. + // + AddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGI= NG_1G_ADDRESS_MASK_64; + if (PagingContext->MachineType =3D=3D IMAGE_FILE_MACHINE_X64) { L4PageTable =3D (UINT64 *)(UINTN)PagingContext->ContextData.X64.PageTa= bleBase; if (L4PageTable[Index4] =3D=3D 0) { @@ -286,7 +293,7 @@ GetPageTableEntry ( return NULL; } =20 - L3PageTable =3D (UINT64 *)(UINTN)(L4PageTable[Index4] & PAGING_4K_ADDR= ESS_MASK_64); + L3PageTable =3D (UINT64 *)(UINTN)(L4PageTable[Index4] & ~AddressEncMas= k & PAGING_4K_ADDRESS_MASK_64); } else { ASSERT((PagingContext->ContextData.Ia32.Attributes & PAGE_TABLE_LIB_PA= GING_CONTEXT_IA32_X64_ATTRIBUTES_PAE) !=3D 0); L3PageTable =3D (UINT64 *)(UINTN)PagingContext->ContextData.Ia32.PageT= ableBase; @@ -301,7 +308,7 @@ GetPageTableEntry ( return &L3PageTable[Index3]; } =20 - L2PageTable =3D (UINT64 *)(UINTN)(L3PageTable[Index3] & PAGING_4K_ADDRES= S_MASK_64); + L2PageTable =3D (UINT64 *)(UINTN)(L3PageTable[Index3] & ~AddressEncMask = & PAGING_4K_ADDRESS_MASK_64); if (L2PageTable[Index2] =3D=3D 0) { *PageAttribute =3D PageNone; return NULL; @@ -313,7 +320,7 @@ GetPageTableEntry ( } =20 // 4k - L1PageTable =3D (UINT64 *)(UINTN)(L2PageTable[Index2] & PAGING_4K_ADDRES= S_MASK_64); + L1PageTable =3D (UINT64 *)(UINTN)(L2PageTable[Index2] & ~AddressEncMask = & PAGING_4K_ADDRESS_MASK_64); if ((L1PageTable[Index1] =3D=3D 0) && (Address !=3D 0)) { *PageAttribute =3D PageNone; return NULL; @@ -499,11 +506,16 @@ SplitPage ( UINT64 BaseAddress; UINT64 *NewPageEntry; UINTN Index; + UINT64 AddressEncMask; =20 ASSERT (PageAttribute =3D=3D Page2M || PageAttribute =3D=3D Page1G); =20 ASSERT (AllocatePagesFunc !=3D NULL); =20 + // Make sure AddressEncMask is contained to smallest supported address f= ield. + // + AddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGI= NG_1G_ADDRESS_MASK_64; + if (PageAttribute =3D=3D Page2M) { // // Split 2M to 4K @@ -515,11 +527,11 @@ SplitPage ( if (NewPageEntry =3D=3D NULL) { return RETURN_OUT_OF_RESOURCES; } - BaseAddress =3D *PageEntry & PAGING_2M_ADDRESS_MASK_64; + BaseAddress =3D *PageEntry & ~AddressEncMask & PAGING_2M_ADDRESS_MAS= K_64; for (Index =3D 0; Index < SIZE_4KB / sizeof(UINT64); Index++) { - NewPageEntry[Index] =3D BaseAddress + SIZE_4KB * Index + ((*PageEn= try) & PAGE_PROGATE_BITS); + NewPageEntry[Index] =3D (BaseAddress + SIZE_4KB * Index) | Address= EncMask | ((*PageEntry) & PAGE_PROGATE_BITS); } - (*PageEntry) =3D (UINT64)(UINTN)NewPageEntry + ((*PageEntry) & PAGE_= PROGATE_BITS); + (*PageEntry) =3D (UINT64)(UINTN)NewPageEntry | AddressEncMask | ((*P= ageEntry) & PAGE_PROGATE_BITS); return RETURN_SUCCESS; } else { return RETURN_UNSUPPORTED; @@ -536,11 +548,11 @@ SplitPage ( if (NewPageEntry =3D=3D NULL) { return RETURN_OUT_OF_RESOURCES; } - BaseAddress =3D *PageEntry & PAGING_1G_ADDRESS_MASK_64; + BaseAddress =3D *PageEntry & ~AddressEncMask & PAGING_1G_ADDRESS_MA= SK_64; for (Index =3D 0; Index < SIZE_4KB / sizeof(UINT64); Index++) { - NewPageEntry[Index] =3D BaseAddress + SIZE_2MB * Index + IA32_PG_P= S + ((*PageEntry) & PAGE_PROGATE_BITS); + NewPageEntry[Index] =3D (BaseAddress + SIZE_2MB * Index) | Address= EncMask | IA32_PG_PS | ((*PageEntry) & PAGE_PROGATE_BITS); } - (*PageEntry) =3D (UINT64)(UINTN)NewPageEntry + ((*PageEntry) & PAGE_= PROGATE_BITS); + (*PageEntry) =3D (UINT64)(UINTN)NewPageEntry | AddressEncMask | ((*P= ageEntry) & PAGE_PROGATE_BITS); return RETURN_SUCCESS; } else { return RETURN_UNSUPPORTED; --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel