From nobody Mon Apr 29 01:16:51 2024 Delivered-To: importer@patchew.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 1488131003449284.99078837646925; Sun, 26 Feb 2017 09:43:23 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E5C2782124; Sun, 26 Feb 2017 09:43:21 -0800 (PST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 519A982101 for ; Sun, 26 Feb 2017 09:43:21 -0800 (PST) Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 17:43:18 +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=pzEI8Km53FugHx7jPHfrTTBux5qzIPk19dohABEXLXg=; b=ufU/l6/p2lyTedjiOFl3GxirMDC4sVmp/5c9AbVboPNyH7AFGYg/FW9IfQqmpSaqGMfV+vUz0yfSGRApP+v10K5yu3GB4+yR52zK7OIDU+cezM0CgpjRhnBsxCm55dZrGa4yWruKI+YVjM6PnbUKJiS1xB+r+uKbHmHnRea9apE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; From: Leo Duran To: Date: Sun, 26 Feb 2017 11:43:02 -0600 Message-ID: <1488130987-2544-2-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488130987-2544-1-git-send-email-leo.duran@amd.com> References: <1488130987-2544-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR13CA0028.namprd13.prod.outlook.com (10.168.240.142) To CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) X-MS-Office365-Filtering-Correlation-Id: bab73c30-6dbc-49c9-35d6-08d45e6ef342 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 3:t1WuWxIebRlau7lNm1JOhawwVRTAXTmF7tHCuJj0AkH42+OvhSWnSiYhub/b6gL8U2yWim69LUGwNJbuTrAedq1dy+9ci6VD9BAQT0da87nZAkiyqwDO+YY3PPTkVC9QxvC+3yCAtLzD4yDHcQoLDUDA3N9BUcxfbMinaXaaijXOCBjYesYy4IO+UyPRSZrY5y3qGhhnTDESJwjBFZhzro3wcbcQWmkTGUErKvy/iAKAWhPkq4jUe69KDaEJKOpEE6S2ZobFw/ixTL7xGje64RztEfNNRXisbBBSpz+kv4I=; 25:sFSfmkMNl9cc1ejV6NSFkyWkesfPESTFT0ldsHRhnt4uIQSStIFLgiFhLQ607YhpMlVQyA8tvfIZQQk3UJONXGNnuFfqGRJM88v2IjUUihOC/fg8wy6MaiwRHFEQ6MeNjpRRDEgU/HzgpVMaK4Xt712F/8qjZkGp9P7lzTuhruRgYfDHc8PSqMUtuCB7J85UiDO4Q81uILPfzD2HOY08n+3Wewu9uQGhUSImNPA8BfQCPNNplFSFstKbjio5HZgwbSmPxRT6DoGIM20IAltVXPIAlNM5Y0Znkm5o9mxzbTMm5jivbime4mu986QyrN0dPqwSt5xSVildbiySVozTfPXE73G71lUP5uJrfPDsnEPiVHQEXJSUiSNksOqXeNhxfZQf1qJQlOuBhCWOImNT7u1vR3Sy1hhAgT/+i1QJw60uJq+agQTIrC8caNaPDT/y30V5nG7SlaI+umONfrEgqw== X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 31:r0rhnmshKpJ7b5UETtx7HpLh11B8vpvZjgJjURE+UPAHEilIQdcpmch4yNkDzGXoNc5zb+nnvVmFNHE2CRGn9CMg3ME8zm0+8vDQhqxkAnlOVHc/6XxYfMZZo1rAICpBDgTQKqh41fPro9KXtWtJqPRuBY8cOZkgQ1Vsk6Qa71HsBHJlQsBgv6OPk9wZ2ASuf5tegFIZOEPCQH9nGUNAdy2RaBWYKGT44sLm2aNTx4Zi+9LhXeDcBEA+dRIeOsv/; 20:nKUY9Brq5TyXtUWp0iO10WwvI1Q3hKVD0Edswii9UZ02ncD62RVfBVTm2HVL0kSiqzGTzXTB8seoY/iyqDbP3BxEM0pAM9li8Hl4ZvILR9fsHic5KjPW3tPgppXA+1H/KnFoM89q2aUFIByUr047Xth66PmTu7TLYh02zLeOWwc+3OFdsqwHoPMf7Ieus42gIJKjvE9/w0Bk71R89aJKW/RpZUXFj0W77jPrhq9UdKHlt2tEidy1rHC2vCdPmDIV71WdfvzDi300dWA/oinQeorkVPf2vIr0GScOy8vinniI0wc5aGvQ6aumdlMHiIb3D8uvYsW6abCKgmdeJa3mqm91LDHwjUnse9Rqh5HeFE/P+L+jvLg7wFYgWsuew53Eo4MEw1nglbOnopMYXYa124BLWZrmvah61MuqY4rHiBQuJg8agtdqeeqQOYKvJ4lKeYdOvMHPjM3Qi/d11esET3zReapgcyG5Nn/idWj/RzScrHjevOteu0NLFxCUV2tJ 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)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(20161123558025)(6072148); SRVR:CY4PR12MB1238; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 4:e7BpK4XmslJvmyTlyVXs6Nva5bIgilIjl3RsZdouyxMPTrb0UU/oSPTWr0nYULpmguLmlnIPyT3jkgZ8b1bjgkSQ31rtMhTmHkS0vf/brMu89x/icb6HkQCTLIoEvSw6Bve5iNNfnWQ1NmrjiL2zLDiy+CPM+FRjXLRgjSX/wzYWC98Rdm3IyKzyANOlK4OG1sejUX/xo/XMkFp7qWBkRMcYnfDyofWcr+9j98l610vY4//GHeSbW8WJ36XgXqUFQ4PbMsipS6MNOeQA/MIqYpXTZ2rUPFQODD4Uffprt9YesZezVeMkI/pb08S+OlzQr6JD5+8+GPYT7uadKNmAJx1uFeltPYqcZdw2AlAQ5th0HUDaR9jjlXPBZi8uXRqwpPSBp/CL9xx4rnGcrW8U4zF7ooASeuIgQKPVgZ+JFq7+zDdKoErnTq/x9FeQVhuoSAOyIUCR/lVDbiya6OXgpWEo3cAicoIhSN6eqCyBuNfM/hW5cIYnyo1Ub7WWt2LI71IFl4IVbXkhQYpLI01JtIurgP0pXb5PSZXLMRphws4BRvs87tRD5Cd8TQNI/saDVU9DVgU3SKX3G5sTRl4tAKLKKB9TjA6t2t2H8/DtnVGx8m1bOteRRNsGWMp8s055wu4dRW3Eyj5apRpx2rSn9K08gfYZJIE53LDLqLZ01xt4caDHWUaJNbdW1qVhrjDbKwxTpSz0kdPCTlKSGSvs7A== X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39450400003)(39840400002)(39410400002)(39850400002)(189002)(199003)(305945005)(53416004)(105586002)(106356001)(68736007)(33646002)(5003940100001)(92566002)(2351001)(189998001)(42186005)(81156014)(86362001)(97736004)(7736002)(6116002)(81166006)(36756003)(8676002)(54906002)(3846002)(50226002)(110136004)(6486002)(47776003)(66066001)(101416001)(25786008)(53936002)(38730400002)(50986999)(48376002)(50466002)(6666003)(76176999)(5660300001)(2906002)(2950100002)(6916009)(4326007)(213903007); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1238; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1238; 23:B+snEZFe8hrShea3CP1cBZ2+pf5gU0m0S41p4t2uP?= =?us-ascii?Q?BsHLPH7xzNk+usc295bK4HWQqpQ1F6qmiVxGHu2z+km8p1SQP7MhuHR8g5o6?= =?us-ascii?Q?RkFI2jS+rmjGnGH1HAgthiGrHSBwVx8G/ZPtWjNkgjTbT2T16e7KgCr6NYrI?= =?us-ascii?Q?8Q+4eQYdoXy8qRgzltZDdwleWDruvXf66EQUXHDZ5yO037zTGdhQTrROC2ED?= =?us-ascii?Q?r1PEZIWKwvM1LO0K+WgxRVdlIgr1St+dS8oDM9zlW0MxzGlWjbSEtfkcHGnq?= =?us-ascii?Q?4joiT47AGxneD0sYlA65aaVrP8Grj7gAegIeQ32wwL6VYx5zdau+Ow4VpE50?= =?us-ascii?Q?Q8QFLTjA+UcFQcuJquWjXCsLt/QleP7QyNSusDqUeB+lD33+EfotQ6ZdDaE4?= =?us-ascii?Q?nftHmArItWXeMvTKeThJBuwF1nVGOh/3X5WH+ekEGHTgRGmuHBTUQzWUv+nZ?= =?us-ascii?Q?nWSHzCgiHiu8rQtKCzBSpMlbui/7xvt/NSsh2Y14E9nvh2dI9Ei5X+HIXjhb?= =?us-ascii?Q?Z+QtftjtC1FixeHaIuE68gtemSlyMDkmqLvxrVcI51uhsePDVVmG55nSTpXZ?= =?us-ascii?Q?UmeegWEIKyu+sHX/MA2kZPXhMv9ufxioHhkqu4rnQiIL8vDuW5yVou/veuZS?= =?us-ascii?Q?0q6wKIVTIrTzUBDEnz4CFPveUeSOSfoV1nO167UaVfkfVdkAG1YxMyYQELWW?= =?us-ascii?Q?Vs37tGnh1yzbkJDD3hnuRz//5r4J/cLkOCximf3Feq8ejsE618w1VSzbVWId?= =?us-ascii?Q?IbVcSzjvJr6HMrp1CtnzCDO4CTnzZ/OR2Akz9c1FWjzJpk1GU9r8BfcOdqex?= =?us-ascii?Q?6jtrqy7MJjOtxfi6a6Q5dH2rjaQMU7AHvxndFSsagnWNGpDaQoceNPFAYAjI?= =?us-ascii?Q?nmg4B67rUPM+3xxGSGMqgXJKaEL5qY4myPwNCGeW9J7QBOSJ8R98+UQ2aqv5?= =?us-ascii?Q?ampm2k3COC25TOBzbMAMHJip/pEAjqfO+ERi9JpBx9+5JCvxLfOeWebixcIZ?= =?us-ascii?Q?tP6bNmdQ1HWZvbyaH5FauYF7CnEF5CBKgpvT+tsatH02fdrtBmDK+iSMLmHR?= =?us-ascii?Q?ABSCylVqjKhWumomW0w9pOax7X/rh2iGdzKdEbZrAJ3Q3rwAhdzV/rBf1DOC?= =?us-ascii?Q?wmD8NxfgPd/ZKPDOy+H6zs2JuRz1UQ8Mb4pdiDsuvGyW69vst6XtYeVVw5A9?= =?us-ascii?Q?FrMGgK5g9qkWyPrHISZHHDTGObB+zLd//CRsdo3eep125fHJHLZhCTtECvB7?= =?us-ascii?Q?n3KX4pgYLOaeo+Rn9w=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 6:ORf7mwQPRZSuDUg6EpBT3IloGJxwsgCQtY9LRyBL1gAaExmeICSBcP/ELP7F+2YfFlXB4rZDErPmYa6w2QgqD07NNvvw96y4YjPftrZvPZF00hQl2wXXxmWw13UYgZoSAbY/rLEmeEyLVff1eVwd7lUHtmey3zxMsRFbS3Oszdxs7tLxqs0BipHGFD+EHVEgSDEfbT9fHW69D5CxhnaNZka/WxWGLC1wvnIFyYFzKWglPJjnzGcwCnYiXyQmQyVofnCPG/uPjXdUPA4hPatUtUpAkrsQ6n9NXMoBydR9mWSq0IvCnzgiUNLev6MOEz/NRRLtHQT+IcHtKP8CUoBsMqdYrLisYt7IisN2vhPqba7Kk0pCSpJQh8Vxi8/N07EV/cEJ5x2VKkvi00gOheJJaOYfovZwMU/fy3UlLzz/YjE=; 5:Gkd2mCMyKhnQ29OxUImXtxnyg4kNedo1DzsDly4FWimt/wr7xKxA36CM6vAD3Pc10a4Ery/hcVCC5D8kWb9qL16wtXXQNTpvKJIJTIaXpI24U+GembOMN9UJ+ivl6CA7fpZCj8tX0N7MnMfwKcQq6w==; 24:008rMKHX6E+aOwliTz9ORydQzA0nNxY+N7LDCzER9ILI8HtCYxgNLNF9h09HhEIE7dK+Lebwi1V032rpngFS417hZSS+Etf/DRYAJMF6gQY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 7:g3LHzlwzGRHeh31m4EFcOQw+XjX/y1INxs0NFtjid7VUR8WS8iGNJLy+sDroxn2cAq0At1iJSUM/EpnYhrDHtJA7j8vCaDJaSbxC0cl3GlNx0S+iDfX5Ytu6XvXfRDZD3atd4D51pvL1tuGxreFJpHrLJ3OaBmEQcovg7HAFJuxprbrkcj/Rxizdsn0jZep5E8qyNQ67WAWzCvgQgBzUzlpbXVUGwh7ozBh3AGo4zy5EaGuSyNpp69TjtJDA5eVwNVw7wNc4IYWpoZXYgXs8j2ILGQqEwQbDqAc5OC7wSeV36/QVGXmn0jvMLJZkLm43ebE8Bj4lq9DuW2YISfIFJQ==; 20:YNewy8YMlDnlAlroeUUZ8lG/h7BNHy7KX0VU9FAkZ7gh0VjM27e5U9tEu/ug4L/9Vezg0jvDrjItRvNvV1g54Xo7uDz3wh8LVjqQIKOZWfFIKxrOg+lrmDniiKPceOJ4G2pZwwlGZPXhZoLho9VIClhpe/ksHCYQp3uGQkmUDIl7uvD30vt5DwkXuemrIOxTfFxCd+SeDZllj9KaohfUzTJJQkxjOXEIwXNebO5r8VzDeyl39Eu0OI2ZlnsaI9Uq X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 17:43:18.3816 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1238 Subject: [edk2] [PATCH v4 1/6] MdeModulePkg: Add 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: Laszlo Ersek , Feng Tian , Leo Duran , Brijesh Singh , 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. Cc: Feng Tian Cc: Star Zeng Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Signed-off-by: Leo Duran Reviewed-by: Star Zeng Reviewed-by: Star Zeng to MdeModulePkg changes. --- MdeModulePkg/MdeModulePkg.dec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 426634f..f45ca84 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -6,6 +6,8 @@ # Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
# Copyright (c) 2016, Linaro Ltd. All rights reserved.
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
+# Copyright (c) 2017, AMD Incorporated. All rights reserved.
+# # This program and the accompanying materials are licensed and made availa= ble under # the terms and conditions of the BSD License that accompanies this distri= bution. # The full text of the license may be found at @@ -1702,6 +1704,12 @@ # @Prompt A list of system FMP ImageTypeId GUIDs gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid|{0x0}|= VOID*|0x30001046 =20 + ## This PCD holds the address mask for page table entries when memory en= cryption is + # enabled on AMD processors supporting the Secure Encrypted Virtualizat= ion (SEV) feature. + # This mask should be applied when creating 1:1 virtual to physical map= ping tables. + # + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0|U= INT64|0x30001047 + [PcdsPatchableInModule] ## Specify memory size with page number for PEI code when # Loading Module at Fixed Address feature is enabled. --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 01:16:51 2024 Delivered-To: importer@patchew.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 1488131007248591.8720942999414; Sun, 26 Feb 2017 09:43:27 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 58C7B82131; Sun, 26 Feb 2017 09:43:24 -0800 (PST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C7DA682101 for ; Sun, 26 Feb 2017 09:43:21 -0800 (PST) Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 17:43:19 +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=pyPdjWsSID7jCmTZPNkiT2JeL8QXOtloY4t6Qm4AxSc=; b=fNtfPLzxL+QtXsOjReRhm6GeaHXLxdboVOpsTuMOWTPLP4lI0Tr8Iww+6C8nHIx9fLQcvvW2tMLAwstgEAzphAEmMYIjS1/2oHeOnly2XFkSvtm8LPWZfdujTak5J9y2fjGx+EsvSj1HZ9bn9fuDvK1lglsrNOwMTAopKsZ5UpM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; From: Leo Duran To: Date: Sun, 26 Feb 2017 11:43:03 -0600 Message-ID: <1488130987-2544-3-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488130987-2544-1-git-send-email-leo.duran@amd.com> References: <1488130987-2544-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR13CA0028.namprd13.prod.outlook.com (10.168.240.142) To CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) X-MS-Office365-Filtering-Correlation-Id: 807f0dd8-946e-47a0-5cb4-08d45e6ef3aa X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 3:HDxMkRP4EQMT00TWrO07qZuXByX1DDoSZqh8W2tDCuFzg5d142ubIcKY1U3mTGjUkiAXsOQiVe4CBuzpJSSbfAwkyWahHA9gEkBLpweeJz8M6LoAX8aeVrcoyrcbJrwDh6atlbrTlDokr6+Nh6YoqdgzVlMOZVlnWLhKMNl5UuwaL1uvfVek90ZU9rozPVr9Zaaql0P2sz4s4ZHvcVEn8g5ic0R427JEJb4rgpH1ld1/SbOfenA7kB9x6VmUM3c20eN4DIrVmnS715CxpChCPwmDBozcIArYRPMX3FO3jrI=; 25:iyTKICSaHe99s8tTe7T/rtYwxj6HFCInfEc9jRrnAJT3eFVdP9MwzssjuyoJEhYE6fA9FTJvmQE0pb/rxUSluEH0v7Yw+zImG36/o6bgQnY5T7VXB3JpQ9r5EYk4nX7ea35EpcUY4190IZJTJq3oTzyQDfypFcYmS6V8BkY5+STqDJe6ZFbCndQOrOUeHqDzfV/Xr/L9cZesYoVN4ffU9v76sYpzpFYYy+7/rpCP/Baq4i5ejRVsYv9BRKOdp6R+TjSv+L1Ye9z4SPvRgS6pjjls1lNdwurT2s/N+qNGPJUZNxCpSqOnol+lI54tOz86zSHniAjUaDozEn1B14dWXMPqCOxNY4CA2wOMdZJePCbapQIyOJGDGYV6GOSCNeafF19Nslh062EUKPAewreEfh4lECi+8RelELUdhya8uzlDXXPI5Z2EJQ5dbBjdo1OeFEPNig97lf/J/VUhUUKNJg== X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 31:gZd0gCliUI5DcXj+qqcaewFIA9aPBfjD1MXwVv2psLBPq8yQ1ulaYQlxfQs/KRC3u4sqZIkd3K6SlYAyVuGKfudWMOY00S+K7PSxS8rtbhd43JxpnICN1OpcK798f09lUbyFZfeA7ol/h6ZqKSdJHmKtkzqdKfDcekN8PPIhka5W0r1qD4FI5efjcfxtFQENefYL1PyBct3DuJA+S5nKpbtVRmOTg+Dg2HlaTp3vF+U=; 20:nbcePofFwKYkFQ7bKlH/1hORmhk9y2TrHPolbOTqLQRl+oMup6g+SOmBYNA1nEf+QVFUlGQ3MFv58V88yCNNHNxbIUREqk+430mQEzVh8UevavgSgPtX05cBcep0tl0KpjUJ43K8JIqfuVsVdbUSOBFOL/m18+dQBwGPtKl+kZaXqJ7+8AP1FJ+LApUT47zWDNEyCFR8GH01Vnd7a/NPHzQHwQngWrxCabz7awXq4iRfWwfldinFCXxJparm+pt56VV1xQVCBETU5d6hJLWIpbbxO/8zP7pBZx8AZFfSY4OV7EB0LvfwsGTxpuFcUCioWiZo05Z9lJr7cPio3MO/ipEKDpOWJw3SX2dW5laJHwEG7lsvaYd33Vp/7990q2UEWgwo+5lmwoms+xZRxxRbvJUfFjKRQeFuhtV3Tn+ZRbUkteC60l2v5y7pREzF7i/0FGYuX4kcY8uU8KxsmhiyuaoHIGqdPyp8kQS/Nge1IAfycT6GVLt750ULkKjMJ6vS 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)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(20161123558025)(6072148); SRVR:CY4PR12MB1238; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 4:Hisd0dRoLZIc5aqKu3k3tuGs/A/UFaBTqqxqvStQitQqn8XA/VRHKoFbcD8G9GmFNq/utGkG/aY8ttM469R3LxM7wESCZKhG90sOGmI2+exLSJ8DOlCiTUZUJAOaRXBFPJWoQ3WYyOyJuJbQolESjeSi7QqNXBygCVA8fRIztY+yl/Sd5VwBwoXor44Q7Oxky6WnW2MrPej6DvWsJt/WdLAsfip1Tw5E15tF3MfLNAjeG2fhi31RDXVeqwUr8wuikcXXmwkyWSp5HYCVnir8pfwK4FTP4d+0T9VWVDDTsGV7aFRaza9N0QESqeuYdsrH1jExobD4Aq5b77THFwOFh//2K3dY7hnnL9uvi1rnBD0DP2/pT2Qh9Vj8iUw/2wtT1po0txfPoMc9DwGNl5k4q5HO5xWrHcLYtFuCC3up/S8sMJ2FJa7HeN0hdAVXhcPLTwd7MRQZw3pZMHCqSVLDGZOVdxhU9BYUWNrgJ8xIDz1ml/fimca3Ta1CpwWOLzfdQT6nkRI817uwGwKY8Py2wGtn0DZdOwmjgIbuDEJ0XybL5JHgmsgJdP1bIrLLQCSfQkeytzFNqNEo9f7ZuEfWKRpiqv1FkD7De9ykWngUmoqBB1W9DJDmoE1Rz17Huv+KYGd5ba0528xXYw+JPAghP/E6nuQkzcVh+bU7h+9lFtYArjntpCgg4ywnb9n5Cgai X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39450400003)(39840400002)(39410400002)(39850400002)(189002)(199003)(305945005)(53416004)(105586002)(106356001)(68736007)(33646002)(5003940100001)(92566002)(2351001)(189998001)(42186005)(81156014)(86362001)(97736004)(7736002)(6116002)(81166006)(36756003)(8676002)(54906002)(3846002)(50226002)(110136004)(6486002)(47776003)(66066001)(101416001)(25786008)(53936002)(38730400002)(50986999)(48376002)(50466002)(6666003)(76176999)(5660300001)(2906002)(2950100002)(6916009)(4326007)(213903007)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1238; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1238; 23:GzFwS79AeaUHkGLvQyUbNetnzRGkO1Yk0Kq0NRE5y?= =?us-ascii?Q?IA+MMrdBFCn6xYwPpdrKhdqJSCRuctGwfLozK9EB6X5sE4qA9mnmH66DPCXo?= =?us-ascii?Q?45UvE6PeISm8rLgRHX3CN5BGh6HL/6TKnKz0iU9ybuz/kGdWQXZrtVGJssTb?= =?us-ascii?Q?oIhIcHKVoz2C5YW1HOTE/wzMdLQ4gpZ+5Qmxv+1p/1wST+9evlhRW5OP5izl?= =?us-ascii?Q?gfXOQP4xUAXVhGFBLSv8parrjY9ybtE9DdU64QV4DrC62k8YZkz4/lOyhlfF?= =?us-ascii?Q?1EuSEVLPB3jJk4gsFs+M6KT/xJdZNE/lhpO7XC/+teEciLus9o3aWyly0eT+?= =?us-ascii?Q?49wIFydX9NuKSEh7XKgRRXy/pQFNd+f6cPqH6EgDBSh8enc7W8CPPCctBvvc?= =?us-ascii?Q?B/PIRsNwhkuzv8acGJJina0cE/9/qOqEx6r9WJGzRs0X0ndoT9YWJbLrBT5O?= =?us-ascii?Q?8jj8xxVJPWmwASKLwgJpteMGUk92SmlLRMBmnMSh7wEmaNP9kzIx9pKKgwCF?= =?us-ascii?Q?3KP0R6irTKeO3xrw678v7gA1Q//8FCaoA3pSKWA09RfNyk15RIzr8uB9xW7n?= =?us-ascii?Q?CNU1qrLws0peqcHwBO/BEmG4EMm3L++yM7bR8r1kuqbjXYRvHqcEjML6QpOE?= =?us-ascii?Q?On4mBgQSDMDUfdODiebdQmveV3uHwpmMWjeg57tY6ejE3sQCVhOQgHuD/jVV?= =?us-ascii?Q?+6nQOd/OGrLtaErHJTrGxvdXKuF87bRAGdkF3Ymfkna2ba83HyKjA74rV1YM?= =?us-ascii?Q?iWMzXjS2AOtREW4fySDp+kkGv02FYL8wkS3pzTystev5thsQzPuAK0oKqRD6?= =?us-ascii?Q?Jry5nDDRux9zl+K0/x6CZgJugwTE8C7pCaskDZjoXdRrSS/VajDxtsN+70F6?= =?us-ascii?Q?xPtZgHledKyASwPJl1pEI+zQWGhL+se6k6eK85XrAFFdAdrZHwyBSMRHxpu3?= =?us-ascii?Q?1nMogS2IUIFAN70+Y+mi0akj2U+/+Sm1dQaF2ISVUbaYWDh+MTKQNqz7xBIh?= =?us-ascii?Q?swXbEk6mRS4tRnL0coZIbTBBeDCkcokdTG4xgccHuEBv7d0jUHxI+i8djHLR?= =?us-ascii?Q?TZwivs5NL7TKCJjz/PMG0jXq8s+ILCDtO0JJawJlkvHWJWTLaISAWNyQ0JhD?= =?us-ascii?Q?HWWjFFTwf72Ig+8Fyr8HFKSYEokpUM9jD7++L8mlzg+nDEbu+H7erYJSXFy5?= =?us-ascii?Q?g5kFThGrzUTxh1F/yG6f2AhDOpf4ifY6TbhRO4Mf5jZMjyDncJWYZw5j2rin?= =?us-ascii?Q?/gY8CwBQcuIJ9Fq7dJxNIiN0GY61b8MJqvIzkkX?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 6:AjTXK87BBh3U3eyrBmW4qP9LHc35uNB5wkOUQyd590p13s7S28ZNcwOFjzpVnXvNovkRaoEPoPhO102+TDktKjqz1QJaOh26/CMPtUhtNocuUzoHL8YnuKJTxqC6eBn0KnwNAjKX+W/xgeTb6S3v37mG8V6y2XifEvMtcZjeqv09PdEKg0W6dbNWpAbBIWc6ae5JKsohnqZ/1FWi6VzhIgbkfRP/zV04V6PSfTZGtWhUGv4Bplm9AaW/AMcvBx1NeRx4v4vSK8h7cfyIPnzvDaG5Dl+j3TlOM8XdgngYZCZ2bOUBue8KGyqp3v0Hh5G78hh7idXXbrJjCqCQ2mlIo9XxoKjmKRU691wV9vkxC/xY8/AMjHew4sLLQH509+Q1yJ4OHF/lZQlsMR5UARkpIjQvPSNFOFB6qvStOL/JOkw=; 5:ZrCJYIiKNUCr67MwYx/I3kgvAGjqLSGlhPHRMXt7zU6/ef7Q/VmJ8pT1+y9IesDymIk6sA+m1qLx6Hqt6F8ak+CYozQeJiXAgwPSfuPj33slpX69lk10bvN1Xmojv10iNpTyV5gpgEfyBuN36Jky9w==; 24:O0+2k5RTVyMVFnuiBeUClTMMoJTnhmrdcbfCsaLes+VzFAUvHzp+2kTgtzRRPT0365YCI4OZQyVnjorqli8z7J3PHqOynOSOFqbP7livF1k= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 7:1dnDl5V5NWSeGnCYe1ocu3JbvjETYk3WAfybgg3cYzj2Rm6lA6tlTQB5jI9iwjUEX1eso2ELM0qjRKy/Y4lPFKL7so08Us/XMGbT9AcpEUROGQXmEG2qFHkJTIndMFz2VdRXjLrfJcGSCwZR4nFq7S18JhDHJhA6Re4MTshSOvsO5bY+QgLGyLo6f+RESR94XbTy0ikuEzxii1uQ9qc/FK6AOLRog49NIW5AvBEralmoXSM58qfCA435z/3n+xqhYBwgV6VRPV4Xdoldqm50cuB/7HDY4K9VEQuwlkHIXxKGvjPKEelTKO+EvlFciGHQceXb2U5Z6yP/G/KgdwSj1g==; 20:9y0eRAd+LoTIDMjAikSqbAEXnvdHN/vPsTe7yo/dfR8JuJ0cLsy474cLdvsA78aaytEzTfQD4xTZlTrLi4MZgGQy7T6liu8uM7HG1Hr68UQ/biso709zTG7VH5cpfYKzzGMUUmTM1OS1D6KTd9ql+3HSECs3LLHoWS/OW/UZFULztwnn4HJ4pr6gYcdMeqvCk2D0e8ybaucG3DrbfEEOxuCHG+NEk6J8I9MnDc2yj1O111/TQbGXrNI32dPpiOQS X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 17:43:19.0642 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1238 Subject: [edk2] [PATCH v4 2/6] MdeModulePkg/Core/DxeIplPeim: 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: Laszlo Ersek , Feng Tian , Leo Duran , Brijesh Singh , 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 creating page tables. 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: Star Zeng --- MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 5 ++- MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c | 12 ++++++-- MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c | 39 +++++++++++++++++++-= ---- MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h | 5 +++ 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/Dx= eIplPeim/DxeIpl.inf index 2bc41be..d62bd9b 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf @@ -6,6 +6,8 @@ # needed to run the DXE Foundation. # # Copyright (c) 2006 - 2016, 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 @@ -111,7 +113,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress ## CONSUMES =20 [Pcd.IA32,Pcd.X64] - gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIM= ES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ##= SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ##= CONSUMES =20 [Pcd.IA32,Pcd.X64,Pcd.ARM,Pcd.AARCH64] gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack ## SOMETIM= ES_CONSUMES diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/MdeModulePkg= /Core/DxeIplPeim/Ia32/DxeLoadFunc.c index 8f6a97a..1957326 100644 --- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c +++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c @@ -2,6 +2,8 @@ Ia32-specific functionality for DxeLoad. =20 Copyright (c) 2006 - 2015, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -82,6 +84,12 @@ Create4GPageTablesIa32Pae ( PAGE_TABLE_ENTRY *PageDirectoryEntry; UINTN TotalPagesNum; UINTN PageAddress; + UINT64 AddressEncMask; + + // + // Make sure AddressEncMask is contained to smallest supported address f= ield + // + AddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGI= NG_1G_ADDRESS_MASK_64; =20 PhysicalAddressBits =3D 32; =20 @@ -111,7 +119,7 @@ Create4GPageTablesIa32Pae ( // // Fill in a Page Directory Pointer Entries // - PageDirectoryPointerEntry->Uint64 =3D (UINT64) (UINTN) PageDirectoryEn= try; + PageDirectoryPointerEntry->Uint64 =3D (UINT64) (UINTN) PageDirectoryEn= try | AddressEncMask; PageDirectoryPointerEntry->Bits.Present =3D 1; =20 for (IndexOfPageDirectoryEntries =3D 0; IndexOfPageDirectoryEntries < = 512; IndexOfPageDirectoryEntries++, PageDirectoryEntry++, PhysicalAddress += =3D SIZE_2MB) { @@ -124,7 +132,7 @@ Create4GPageTablesIa32Pae ( // // Fill in the Page Directory entries // - PageDirectoryEntry->Uint64 =3D (UINT64) PhysicalAddress; + PageDirectoryEntry->Uint64 =3D (UINT64) PhysicalAddress | AddressE= ncMask; PageDirectoryEntry->Bits.ReadWrite =3D 1; PageDirectoryEntry->Bits.Present =3D 1; PageDirectoryEntry->Bits.MustBe1 =3D 1; diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c b/MdeModulePk= g/Core/DxeIplPeim/X64/VirtualMemory.c index 790f6ab..48150be 100644 --- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c +++ b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c @@ -16,6 +16,8 @@ 3) IA-32 Intel(R) Architecture Software Developer's Manual Volume 3:Sy= stem Programmer's Guide, Intel =20 Copyright (c) 2006 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -29,6 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. #include "DxeIpl.h" #include "VirtualMemory.h" =20 + /** Enable Execute Disable Bit. =20 @@ -65,20 +68,27 @@ Split2MPageTo4K ( EFI_PHYSICAL_ADDRESS PhysicalAddress4K; UINTN IndexOfPageTableEntries; PAGE_TABLE_4K_ENTRY *PageTableEntry; + UINT64 AddressEncMask; + + // + // Make sure AddressEncMask is contained to smallest supported address f= ield + // + AddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGI= NG_1G_ADDRESS_MASK_64; =20 PageTableEntry =3D AllocatePages (1); ASSERT (PageTableEntry !=3D NULL); + // // Fill in 2M page entry. // - *PageEntry2M =3D (UINT64) (UINTN) PageTableEntry | IA32_PG_P | IA32_PG_R= W; + *PageEntry2M =3D (UINT64) (UINTN) PageTableEntry | AddressEncMask | IA32= _PG_P | IA32_PG_RW; =20 PhysicalAddress4K =3D PhysicalAddress; for (IndexOfPageTableEntries =3D 0; IndexOfPageTableEntries < 512; Index= OfPageTableEntries++, PageTableEntry++, PhysicalAddress4K +=3D SIZE_4KB) { // // Fill in the Page Table entries // - PageTableEntry->Uint64 =3D (UINT64) PhysicalAddress4K; + PageTableEntry->Uint64 =3D (UINT64) PhysicalAddress4K | AddressEncMask; PageTableEntry->Bits.ReadWrite =3D 1; PageTableEntry->Bits.Present =3D 1; if ((PhysicalAddress4K >=3D StackBase) && (PhysicalAddress4K < StackBa= se + StackSize)) { @@ -110,13 +120,20 @@ Split1GPageTo2M ( EFI_PHYSICAL_ADDRESS PhysicalAddress2M; UINTN IndexOfPageDirectoryEntries; PAGE_TABLE_ENTRY *PageDirectoryEntry; + UINT64 AddressEncMask; + + // + // Make sure AddressEncMask is contained to smallest supported address f= ield + // + AddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGI= NG_1G_ADDRESS_MASK_64; =20 PageDirectoryEntry =3D AllocatePages (1); ASSERT (PageDirectoryEntry !=3D NULL); + // // Fill in 1G page entry. // - *PageEntry1G =3D (UINT64) (UINTN) PageDirectoryEntry | IA32_PG_P | IA32_= PG_RW; + *PageEntry1G =3D (UINT64) (UINTN) PageDirectoryEntry | AddressEncMask | = IA32_PG_P | IA32_PG_RW; =20 PhysicalAddress2M =3D PhysicalAddress; for (IndexOfPageDirectoryEntries =3D 0; IndexOfPageDirectoryEntries < 51= 2; IndexOfPageDirectoryEntries++, PageDirectoryEntry++, PhysicalAddress2M += =3D SIZE_2MB) { @@ -129,7 +146,7 @@ Split1GPageTo2M ( // // Fill in the Page Directory entries // - PageDirectoryEntry->Uint64 =3D (UINT64) PhysicalAddress2M; + PageDirectoryEntry->Uint64 =3D (UINT64) PhysicalAddress2M | AddressE= ncMask; PageDirectoryEntry->Bits.ReadWrite =3D 1; PageDirectoryEntry->Bits.Present =3D 1; PageDirectoryEntry->Bits.MustBe1 =3D 1; @@ -171,6 +188,12 @@ CreateIdentityMappingPageTables ( VOID *Hob; BOOLEAN Page1GSupport; PAGE_TABLE_1G_ENTRY *PageDirectory1GEntry; + UINT64 AddressEncMask; + + // + // Make sure AddressEncMask is contained to smallest supported address f= ield + // + AddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGI= NG_1G_ADDRESS_MASK_64; =20 Page1GSupport =3D FALSE; if (PcdGetBool(PcdUse1GPageTable)) { @@ -248,7 +271,7 @@ CreateIdentityMappingPageTables ( // // Make a PML4 Entry // - PageMapLevel4Entry->Uint64 =3D (UINT64)(UINTN)PageDirectoryPointerEntr= y; + PageMapLevel4Entry->Uint64 =3D (UINT64)(UINTN)PageDirectoryPointerEntr= y | AddressEncMask; PageMapLevel4Entry->Bits.ReadWrite =3D 1; PageMapLevel4Entry->Bits.Present =3D 1; =20 @@ -262,7 +285,7 @@ CreateIdentityMappingPageTables ( // // Fill in the Page Directory entries // - PageDirectory1GEntry->Uint64 =3D (UINT64)PageAddress; + PageDirectory1GEntry->Uint64 =3D (UINT64)PageAddress | AddressEn= cMask; PageDirectory1GEntry->Bits.ReadWrite =3D 1; PageDirectory1GEntry->Bits.Present =3D 1; PageDirectory1GEntry->Bits.MustBe1 =3D 1; @@ -280,7 +303,7 @@ CreateIdentityMappingPageTables ( // // Fill in a Page Directory Pointer Entries // - PageDirectoryPointerEntry->Uint64 =3D (UINT64)(UINTN)PageDirectory= Entry; + PageDirectoryPointerEntry->Uint64 =3D (UINT64)(UINTN)PageDirectory= Entry | AddressEncMask; PageDirectoryPointerEntry->Bits.ReadWrite =3D 1; PageDirectoryPointerEntry->Bits.Present =3D 1; =20 @@ -294,7 +317,7 @@ CreateIdentityMappingPageTables ( // // Fill in the Page Directory entries // - PageDirectoryEntry->Uint64 =3D (UINT64)PageAddress; + PageDirectoryEntry->Uint64 =3D (UINT64)PageAddress | AddressEn= cMask; PageDirectoryEntry->Bits.ReadWrite =3D 1; PageDirectoryEntry->Bits.Present =3D 1; PageDirectoryEntry->Bits.MustBe1 =3D 1; diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h b/MdeModulePk= g/Core/DxeIplPeim/X64/VirtualMemory.h index 20c31f5..7c9bb49 100644 --- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h +++ b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h @@ -8,6 +8,8 @@ 4) AMD64 Architecture Programmer's Manual Volume 2: System Programming =20 Copyright (c) 2006 - 2015, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -23,6 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. =20 #define SYS_CODE64_SEL 0x38 =20 + #pragma pack(1) =20 typedef union { @@ -148,6 +151,8 @@ typedef union { #define IA32_PG_P BIT0 #define IA32_PG_RW BIT1 =20 +#define PAGING_1G_ADDRESS_MASK_64 0x000FFFFFC0000000ull + /** Enable Execute Disable Bit. =20 --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 01:16:51 2024 Delivered-To: importer@patchew.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 1488131009388373.10911204386025; Sun, 26 Feb 2017 09:43:29 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9329E82136; Sun, 26 Feb 2017 09:43:24 -0800 (PST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0857382126 for ; Sun, 26 Feb 2017 09:43:22 -0800 (PST) Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 17:43:19 +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=X7YLsSHQ7CApMv6276buW0ucHMeEBQ3FzT+DzzUNjkM=; b=Std0627bDUhtQgntkzIBz2wI1QlghN1bm4/Be6KrVLF9nFeJvnqGKgOYXh9icWGhoTVVuAdyhEdL7x9+5HWHdqS0VKowq05L6CoTmKj6QVk0O8taqMld43fmg3NIUmIpzRykwUzxiYk0ESkFRqtwovjjK/k5XYxiYrU5LOT6yio= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; From: Leo Duran To: Date: Sun, 26 Feb 2017 11:43:04 -0600 Message-ID: <1488130987-2544-4-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488130987-2544-1-git-send-email-leo.duran@amd.com> References: <1488130987-2544-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR13CA0028.namprd13.prod.outlook.com (10.168.240.142) To CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) X-MS-Office365-Filtering-Correlation-Id: f309ea8b-e08e-46f7-9a2f-08d45e6ef406 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 3:hISKPUib0jT6mqKjXgcax7MmDIs2jJv0ROvrRG65hdkjI+hpk11kiz+La9yPdPCbcSyxvBV112UB5Q6g/uu+V6apoQzxTu2IR0sersxHMmPJm86lKOh2JUarQOgPpjNOe8KNRMn5w8Tsl+Bc50TBGGSLp3P9sy2neIutea/KE+huwBYG71kmFKx5Op0lNUMN/XSMKL80A58rhxVzV2DUhuh35rS28STq+duOLa2IiuYd0lQoCTulHwMJiBxjIBh7AXtpprJgtZJb7Faba+SsgNZlyku414hb/c5oecxiXnY=; 25:zDCVvxZGuixpKoRPhyPbeCj5SBXGho+Ys+ZBng9PYv3JbJQDqRzSU8Y95uP/C5GgDb0JIx1F2JHcshWydboksFnbvp2JhgLC9NMUZy+sxMg6Z9rzAahTGFzUoZuOOvpuBBhGKpXUHGu8HAvItmbAWbiOBfc1DuQkJdszQnzmFDYy6PNPzReUZplnLKjhXZneUPr95K1qoBhuyWd6R3qmVdDcIhrrYpIDpe3gJJmQyro2DO3PQinP3oyBFdD6lrRyeuwoDMUoRA2F6pk64w/R03HD9vSOivRY7iK8Jwg23j5E2/SvwEBx403ki0DZP29qdB1dJl/8aqpccDbA/3SR/VjELocx+iz7FTcSTYltlKzCNf7vjbjFToSE4KvL1k/Tqtnx3+6YWjvXShd0XQ7G1cOKP6zl9ifr5KhD63vK/gmYqH7GDIMuEQDnrafaTz8+JwKs0pL17SaYpaMx62Lu9w== X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 31:qYR5V9Uf+5C6OJrpBJjun3eda/1O6ccB94BUiXMpgBaVN1C7AX1iJrKy0PbxA9Z1ZoLMfn+EYAELsrvzeUrR1oK1V9kqJBSXGejj2KqVIvFwEEqsX2Yrvl8kf+hrnaxRdrb/yaimvs3qOgsfPNT2Zc3s5vBXhOQ9cYmUUr+gW/D4oIKADkm0dToS6asSJIOa/8N6nUu9cM9FEepE5YpBi9abpyBKSmki4lj1AQh2BjQ=; 20:i6CuViPHSweYgsOV6XJtJd1JwvyMCmP7kfYcD8dSHoxpphC06Xwri4vY4JZ4AMTgSARhissW3ryr7/3oL7BcP6ZSFWllz4O3127QYtviir/wmyJYwRJN6U6GUluqpnCxSQxsUbVJMFQ0DyvyZ1c+scFZIyu2GT+d4x8B3zArq8zkHQmjEFMWNlk+0g8RS3QRdzHX3MlbkYwsOo7VOoC7Zl/BTXIXd3gfjcjcyiQiD+EprAw5nMRyNnUZosMHCWeHME9+pueGVFzoFtt2+4/OoeSP2yoG9wTGIyZMNk8sHmRi+swNcL9dofQtyZjBx8ujkAbJYSJFwjePvET/DG7VxBpX7lEsHpirPOb1WxxHGAnTb5OtcfPL0MUAjWexyja9NmZ9BM6bitpleqC73HI9YKtgO2Ansp1SzlNfZY8zdJl61SZOZXeqkXSMEbLOuiITYIaXH18Sp//ptlW7POq7KKDldkgRiARtdY9vuufwIca5e1DMrSo3QRTNHh7FGOjS 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)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(20161123558025)(6072148); SRVR:CY4PR12MB1238; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 4:MX4rYdNdioyPkd4psrsQD8XnQ/34ks/szgqxqlrPcS46FreAv/2MDZ/dEo96r9mzapXcYSUuAZtoTS2f5Z7W3FmUPpmRGo80B2Jek+hJTjHyKHUYpR1QnuWwgf1y4KTKdYQPaMBf6O62hthSVn/pQM9X72b4dERdh3M+mVLAU6QTeVZwg+N5QXNO0RiPn88BwC8Z9NifZDBQ6YPhIzSfHF6gQOLNcMOVc9ZXmvFkXIDSOuOC/9rks8IxoR8mYsTUyM9EgVpUe0RenzP2XkbpstkZ3JvG0zXznQH1Nwi+07G3wpf34PSqnY9WIeO+WsvIpfaUXh8JNALqn/vIp4H0ztFv2sbXsRNTFCrToG+L0RELfrcKd2waFMatKDjjH6Z9t1F8h2PCKp/g/wyHtpzAPab485cgRO6OSXoNkn6nSPUo4IOWxnJZBJbYIRsKNEmjIILxeVbMhEGQ3fVsMvDYZ4BeefgYO+k8sNdJZRw9x9T5rT2/Agn8i4HcrRC0MIKrfXquHSQ8CVLOef1hoBEgawpvz9wmy5YmKsJqN05WGttWeBqv3frMSkDz7K0WyyRDdbh2kOTH1b5dyhAWQVh3g2Tw8PGib0wcQq03YffZbpRNOnqbAan0VkEkbvZUSgtoxYxoJM0tBg/QTXwg93sahyk4Atjr5Cs/zzrbD2WxNiJzAhnQkSVa3vRcapB8Ztns X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39450400003)(39840400002)(39410400002)(39850400002)(189002)(199003)(305945005)(53416004)(105586002)(106356001)(68736007)(33646002)(5003940100001)(92566002)(2351001)(189998001)(42186005)(81156014)(86362001)(97736004)(7736002)(6116002)(81166006)(575784001)(36756003)(8676002)(54906002)(3846002)(50226002)(110136004)(6486002)(47776003)(66066001)(101416001)(25786008)(53936002)(38730400002)(50986999)(48376002)(50466002)(6666003)(76176999)(5660300001)(2906002)(2950100002)(6916009)(4326007)(213903007)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1238; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1238; 23:zMtn4X3s34DkpBvFaSo7RfuKXGAjNL4SFngImiHPh?= =?us-ascii?Q?UE4sPwbYGyBZyahtpFzE+Oww9b+5YfAEn2vFoyAaMuvl8MABbNZn4ea9Vg2L?= =?us-ascii?Q?9T8zzk3VcC4cWTfPJjVZdQQ5dlBP5V/fx5YEWpEtA6HIRhjuGJ83gCvQe/Am?= =?us-ascii?Q?HNLR77cNB4tFHaj9477YAAFL262ooE+5hrnJmSmTfCvUPpDCH+owPUu3c2z2?= =?us-ascii?Q?9Q5FXsCZGeYAtJoNJRygFoWTxYaws+YHBN2jx5bC4Ch1Z9gqVumiqQPkm1Yr?= =?us-ascii?Q?ZZ+FPVfr/fnJ26DjPB6InjrzKJs4ovhFtVFcuucorNWXAAou+p0juT5+Ge8K?= =?us-ascii?Q?a3vNUXZPpM7Oyuci7Yz9VwTUnwYwjdajGEZv/RToy7ZVaa7NrH42kV1iV9uj?= =?us-ascii?Q?+zi+CL+dCxG2pOrW+3nNEmEG/F591ZIOXK2m2mZtPMJjoppRuBT1YAhYsBFa?= =?us-ascii?Q?bVB6ytPG2iHQTUIEcwNDWrMbFGrAS9FeIo1/PzqgD2enx/LAaO2aey2IFAFr?= =?us-ascii?Q?J2zThJ4laL/ibgzrs6aQ/HDGUi2xdpL57Ss5Jla4+ETalH/Z23rVzr267E9x?= =?us-ascii?Q?Ve+/nqOJO9zT3j67rr8XkoOovSMLbmM0DS7pW0qCMLUeZkTlhEwH+yh81YuW?= =?us-ascii?Q?shCsiCU8YVlKzkceBrmCGGoFjlwiDRlq3jg7KH+AR9vD+2+40gg0famRmfUt?= =?us-ascii?Q?xAzP3QM+Qwik/RORLSP1/BTkoijtZW1R3+oVHybpDKoWCLqsxsn0B1srqhFG?= =?us-ascii?Q?6yNGaQotRpBv+Mu7aAERtYw64V71Bmv2VLJDzC4lDNHKZkwzPEw03DHAfW9c?= =?us-ascii?Q?l1rXnIIDE/pMcsYAaILcmOtS4FH31PX6VnW4o0zwZhFBwREskPrTQnZ/UpdK?= =?us-ascii?Q?UNtqSSB6w5uNpi2iT9/Ext/4MxzGMaOhswWeuzDDd9h+EkxVFpp3qRK9cf+6?= =?us-ascii?Q?Jm+VA/GVLOxf4jfAXdugnzJkmiBKzUUXqWeEeueGqmDEqIh2zyaXHalZTsf1?= =?us-ascii?Q?UK9WblgvewpN2Xzk5RPbG5oX0/0bgpZuIo4b7JhN4OTg+OqfyrFG7f2dw/rI?= =?us-ascii?Q?EOUjlA7nWUq2RJON3+Hhz3h4E3KF7dwFkqzrSVa5FoMhaJu/0nkTNI7bL17I?= =?us-ascii?Q?epUWoOzumZCcUuDXw+syOQNSEnnvhCNJ+2o1IETGOHg3VE/wZHRQ1BO4SFsh?= =?us-ascii?Q?3eB03dFfxR9LaHKAMdzhQkM6Yhqj7PFc8TGqOzEU0+P1Qd7/Yb5AYTqtV+jL?= =?us-ascii?Q?wZjhmGu8f2MQfE+0AETfB6xzEusW+JEHYe/ddsWiM3yFzyqmWDsN7nLJYJtv?= =?us-ascii?B?QT09?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 6:/ADwDhDyoMJFe/NtbotNpP1iFO13IF/Nvxwr9T6wB8fFrbtfWpHxGreZR/Tnrt3aqm1jZdVLXVqCmF3Ym11X7sPaFNblB8aWD53aOtTKNRTh/u9mB7kziW8br5sJ5l+rQSCi5pwGAJwIizjUNqOYUUzq5tN+HC/aKCrDwKkFbvPorPOX/cJJVqc47b90+gRX6i812LBp7ZeRZsPGOjgD+yS3lvNmUxUvk8VOSBgx/m6LSM/WTMEpR50qnVGeNHIEvyZ4MPBaHcNgitH5XtcqwYcIe8csj3lJlr4nul+MPWrgx0f7pLj3355e9/2zgpG68mLRdzT1IWrWqLeOO4aU+lhQPawV3Bqjyc+14/d3x/3MgCneBBVrwDj3G3f+KBaTlKUYJdcJ/zCHUkUBB7PGSOnFowgditAezvjMzSyGxOQ=; 5:gqQ+7vgx7y5sKHLzxCd0b5nTEqVc0aqouuOJF9TLuBlzRlZjFcy3ed5mc+Lq56meOlqcLC23aeSz/aVhCUTEZZptX8CJdFcrAeK9QHSXxhEHg3adcSRmFLKopUzO6+wYO6ZKDVowE2jYKnuDTSvZ5A==; 24:b2o5wjXfJIMjKbYRr3uqa9oxGnJrzFFpbnvmyjwEvRuu12+S/lL4HCe6AIQJnrW8etgEUO7QK2hqytoWpojknX2Cz09JrPehJy9Bko4k68A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 7:x7jFiZEHwWpiV9GlDB0g/9516VqoyQpM4oBl6blhsywWiK2cTCgAgGpe9g57HqT5T85lVtnxZWpHUZXxqIm0pyZTGfUePrFthpbaZo+U9VU+gpz3BzyTIK96ZW+iAIxd1IN96sslvFwDQ8VAzE1RPH0N3KThu0mWpNOukFH/q83BUQ6agRnzqr8KqlnlwWsvtlMRAxDFRXHrR3iz+SIJt1PBbkov9XN5hqkFLdWnoxPz20sOET3eCquqnOI+ETPShwvJPdp6lflmNvDiW6jA7L0ISfx6h+qtmA7TiWLOVXAElXwFD18zfHeHFUf/yp1fndBgaGqfvhov98E7tCU0Wg==; 20:u3GVnMWZaJN4oCXxUqoyVe0+0xgVsOYq2RTYgpXVeEDCAmmYrP92h3Y9dMaHVgBvm8qARwtfz7liRfrSXuypB1lDHyl4Eg98LBdm0XvnFA6EhOPEOg4xK9qZbo9gH3wMGbFYDszrswDo7p2IVAzXa5XGJ0F0qkIqggd5KZAeKus14hxEFg8OkJtoubtO32cLG6Q1unGF1qiv3xhcURrbOb6h6KieKkUjxKM62HVXh5JgPhJCmtd1UkwvHv3NX0ai X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 17:43:19.6677 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1238 Subject: [edk2] [PATCH v4 3/6] MdeModulePkg/Universal/CapsulePei: 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: Laszlo Ersek , Feng Tian , Leo Duran , Brijesh Singh , 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 4GB tables are created (UefiCapsule.c), and when the tables are expanded on-demand by page-faults above 4GB's (X64Entry.c). 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: Star Zeng --- MdeModulePkg/Universal/CapsulePei/CapsulePei.inf | 2 ++ .../Universal/CapsulePei/Common/CommonHeader.h | 5 +++++ MdeModulePkg/Universal/CapsulePei/UefiCapsule.c | 17 +++++++++++---- MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c | 24 +++++++++++++++---= ---- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf b/MdeModulePk= g/Universal/CapsulePei/CapsulePei.inf index d2ca0d0..c54bc21 100644 --- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf +++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf @@ -7,6 +7,7 @@ # buffer overflow, integer overflow. # # Copyright (c) 2006 - 2016, 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 @@ -76,6 +77,7 @@ [Pcd.IA32] gEfiMdeModulePkgTokenSpaceGuid.PcdCapsuleCoalesceFile ## SOMETIMES_C= ONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_C= ONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ##= CONSUMES =20 [FeaturePcd.IA32] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode ## CONSUMES diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h b/MdeM= odulePkg/Universal/CapsulePei/Common/CommonHeader.h index 7298874..cac4442 100644 --- a/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h +++ b/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h @@ -2,6 +2,8 @@ Common header file. =20 Copyright (c) 2011 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -20,6 +22,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. // #define EXTRA_PAGE_TABLE_PAGES 8 =20 +#define PAGING_1G_ADDRESS_MASK_64 0x000FFFFFC0000000ull + // // This capsule PEIM puts its private data at the start of the // coalesced capsule. Here's the structure definition. @@ -60,6 +64,7 @@ typedef struct { EFI_PHYSICAL_ADDRESS MemoryBase64Ptr; EFI_PHYSICAL_ADDRESS MemorySize64Ptr; BOOLEAN Page1GSupport; + UINT64 AddressEncMask; } SWITCH_32_TO_64_CONTEXT; =20 typedef struct { diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg= /Universal/CapsulePei/UefiCapsule.c index 9ac9d22..34b095a 100644 --- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c +++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c @@ -2,6 +2,7 @@ Capsule update PEIM for UEFI2.0 =20 Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions @@ -41,6 +42,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST IA32_DESCRIPTOR mGdt = =3D { (UINTN) mGdtEntries }; =20 + /** The function will check if 1G page is supported. =20 @@ -145,6 +147,12 @@ Create4GPageTables ( PAGE_TABLE_ENTRY *PageDirectoryEntry; UINTN BigPageAddress; PAGE_TABLE_1G_ENTRY *PageDirectory1GEntry; + UINT64 AddressEncMask; + + // + // Make sure AddressEncMask is contained to smallest supported address f= ield. + // + AddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGI= NG_1G_ADDRESS_MASK_64; =20 // // Create 4G page table by default, @@ -187,7 +195,7 @@ Create4GPageTables ( // // Make a PML4 Entry // - PageMapLevel4Entry->Uint64 =3D (UINT64)(UINTN)PageDirectoryPointerEntr= y; + PageMapLevel4Entry->Uint64 =3D (UINT64)(UINTN)PageDirectoryPointerEntr= y | AddressEncMask; PageMapLevel4Entry->Bits.ReadWrite =3D 1; PageMapLevel4Entry->Bits.Present =3D 1; =20 @@ -198,7 +206,7 @@ Create4GPageTables ( // // Fill in the Page Directory entries // - PageDirectory1GEntry->Uint64 =3D (UINT64)PageAddress; + PageDirectory1GEntry->Uint64 =3D (UINT64)PageAddress | AddressEncM= ask; PageDirectory1GEntry->Bits.ReadWrite =3D 1; PageDirectory1GEntry->Bits.Present =3D 1; PageDirectory1GEntry->Bits.MustBe1 =3D 1; @@ -215,7 +223,7 @@ Create4GPageTables ( // // Fill in a Page Directory Pointer Entries // - PageDirectoryPointerEntry->Uint64 =3D (UINT64)(UINTN)PageDirectory= Entry; + PageDirectoryPointerEntry->Uint64 =3D (UINT64)(UINTN)PageDirectory= Entry | AddressEncMask; PageDirectoryPointerEntry->Bits.ReadWrite =3D 1; PageDirectoryPointerEntry->Bits.Present =3D 1; =20 @@ -223,7 +231,7 @@ Create4GPageTables ( // // Fill in the Page Directory entries // - PageDirectoryEntry->Uint64 =3D (UINT64)PageAddress; + PageDirectoryEntry->Uint64 =3D (UINT64)PageAddress | AddressEncM= ask; PageDirectoryEntry->Bits.ReadWrite =3D 1; PageDirectoryEntry->Bits.Present =3D 1; PageDirectoryEntry->Bits.MustBe1 =3D 1; @@ -443,6 +451,7 @@ ModeSwitch ( Context.MemoryBase64Ptr =3D (EFI_PHYSICAL_ADDRESS)(UINTN)&MemoryBa= se64; Context.MemorySize64Ptr =3D (EFI_PHYSICAL_ADDRESS)(UINTN)&MemorySi= ze64; Context.Page1GSupport =3D Page1GSupport; + Context.AddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddres= sOrMask) & PAGING_1G_ADDRESS_MASK_64; =20 // // Prepare data for return back diff --git a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c b/MdeModulePk= g/Universal/CapsulePei/X64/X64Entry.c index 5ad95d2..e1871c3 100644 --- a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c +++ b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c @@ -2,6 +2,8 @@ The X64 entrypoint is used to process capsule in long mode. =20 Copyright (c) 2011 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -29,6 +31,7 @@ typedef struct _PAGE_FAULT_CONTEXT { UINT64 PhyMask; UINTN PageFaultBuffer; UINTN PageFaultIndex; + UINT64 AddressEncMask; // // Store the uplink information for each page being used. // @@ -114,21 +117,25 @@ AcquirePage ( ) { UINTN Address; + UINT64 AddressEncMask; =20 Address =3D PageFaultContext->PageFaultBuffer + EFI_PAGES_TO_SIZE (PageF= aultContext->PageFaultIndex); ZeroMem ((VOID *) Address, EFI_PAGES_TO_SIZE (1)); =20 + AddressEncMask =3D PageFaultContext->AddressEncMask; + // // Cut the previous uplink if it exists and wasn't overwritten. // - if ((PageFaultContext->PageFaultUplink[PageFaultContext->PageFaultIndex]= !=3D NULL) && ((*PageFaultContext->PageFaultUplink[PageFaultContext->PageF= aultIndex] & PageFaultContext->PhyMask) =3D=3D Address)) { + if ((PageFaultContext->PageFaultUplink[PageFaultContext->PageFaultIndex]= !=3D NULL) && + ((*PageFaultContext->PageFaultUplink[PageFaultContext->PageFaultIndex= ] & ~AddressEncMask & PageFaultContext->PhyMask) =3D=3D Address)) { *PageFaultContext->PageFaultUplink[PageFaultContext->PageFaultIndex] = =3D 0; } =20 // // Link & Record the current uplink. // - *Uplink =3D Address | IA32_PG_P | IA32_PG_RW; + *Uplink =3D Address | AddressEncMask | IA32_PG_P | IA32_PG_RW; PageFaultContext->PageFaultUplink[PageFaultContext->PageFaultIndex] =3D = Uplink; =20 PageFaultContext->PageFaultIndex =3D (PageFaultContext->PageFaultIndex += 1) % EXTRA_PAGE_TABLE_PAGES; @@ -153,6 +160,7 @@ PageFaultHandler ( UINT64 *PageTable; UINT64 PFAddress; UINTN PTIndex; + UINT64 AddressEncMask; =20 // // Get the IDT Descriptor. @@ -163,6 +171,7 @@ PageFaultHandler ( // PageFaultContext =3D (PAGE_FAULT_CONTEXT *) (UINTN) (Idtr.Base - sizeof = (PAGE_FAULT_CONTEXT)); PhyMask =3D PageFaultContext->PhyMask; + AddressEncMask =3D PageFaultContext->AddressEncMask; =20 PFAddress =3D AsmReadCr2 (); DEBUG ((EFI_D_ERROR, "CapsuleX64 - PageFaultHandler: Cr2 - %lx\n", PFAdd= ress)); @@ -179,19 +188,19 @@ PageFaultHandler ( if ((PageTable[PTIndex] & IA32_PG_P) =3D=3D 0) { AcquirePage (PageFaultContext, &PageTable[PTIndex]); } - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & PhyMask); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~AddressEncMask & Ph= yMask); PTIndex =3D BitFieldRead64 (PFAddress, 30, 38); // PDPTE if (PageFaultContext->Page1GSupport) { - PageTable[PTIndex] =3D (PFAddress & ~((1ull << 30) - 1)) | IA32_PG_P |= IA32_PG_RW | IA32_PG_PS; + PageTable[PTIndex] =3D ((PFAddress | AddressEncMask) & ~((1ull << 30) = - 1)) | IA32_PG_P | IA32_PG_RW | IA32_PG_PS; } else { if ((PageTable[PTIndex] & IA32_PG_P) =3D=3D 0) { AcquirePage (PageFaultContext, &PageTable[PTIndex]); } - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & PhyMask); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~AddressEncMask & = PhyMask); PTIndex =3D BitFieldRead64 (PFAddress, 21, 29); // PD - PageTable[PTIndex] =3D (PFAddress & ~((1ull << 21) - 1)) | IA32_PG_P |= IA32_PG_RW | IA32_PG_PS; + PageTable[PTIndex] =3D ((PFAddress | AddressEncMask) & ~((1ull << 21) = - 1)) | IA32_PG_P | IA32_PG_RW | IA32_PG_PS; } =20 return NULL; @@ -244,6 +253,7 @@ _ModuleEntryPoint ( // Hook page fault handler to handle >4G request. // PageFaultIdtTable.PageFaultContext.Page1GSupport =3D EntrypointContext->= Page1GSupport; + PageFaultIdtTable.PageFaultContext.AddressEncMask =3D EntrypointContext-= >AddressEncMask; IdtEntry =3D (IA32_IDT_GATE_DESCRIPTOR *) (X64Idtr.Base + (14 * sizeof (= IA32_IDT_GATE_DESCRIPTOR))); HookPageFaultHandler (IdtEntry, &(PageFaultIdtTable.PageFaultContext)); =20 @@ -298,4 +308,4 @@ _ModuleEntryPoint ( // ASSERT (FALSE); return EFI_SUCCESS; -} \ No newline at end of file +} --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 01:16:51 2024 Delivered-To: importer@patchew.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 1488131012056950.049233243029; Sun, 26 Feb 2017 09:43:32 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CB8A782123; Sun, 26 Feb 2017 09:43:24 -0800 (PST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3E11482127 for ; Sun, 26 Feb 2017 09:43:22 -0800 (PST) Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 17:43:20 +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=4DtuCFuMxAG3tRhvhEqLYzYoxuH7+tUpJmzgyAkOmxA=; b=cinbnOwx4DiowiyGFUA8VYKYpi7uNATWR4Azi64b8KiA/8DFWSAk9CXaVhl72ZYENPvCMqAqXyuQDilDXCvfTJ+zBqvLflRRPQmYGv+A1BeeuRmetxIx9JQG20wo6a4nqtWSsmwT8QPUi0oJol2WHtAIszMYRUwwms9/wY3oR8o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; From: Leo Duran To: Date: Sun, 26 Feb 2017 11:43:05 -0600 Message-ID: <1488130987-2544-5-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488130987-2544-1-git-send-email-leo.duran@amd.com> References: <1488130987-2544-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR13CA0028.namprd13.prod.outlook.com (10.168.240.142) To CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) X-MS-Office365-Filtering-Correlation-Id: a0cba31a-bc9d-4d01-6b5a-08d45e6ef472 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 3:Fycj51RpjtETRuc0HE5GtFX9yyIta24Ce7cnx+CdzvvE5PAAgiL2WpFKvS3V4C1Gzs3KB0p1q0lp0ORCSU2dd+RGVdLb9D0eojwd565Phf5QgyccjzSz09I307B5g8y6pkmxp0a8QDy0QzjP6FvGErseeCa+RiS57w83sxh5OSxKzDUR0MyfkUqNw28bxquh9AhgbbxoiM1eR49rgF4wyGGVGOrOS3u4EVES0sjpONWPHxz4YTr1n0Ckr2g3ztxlaKAGGkyVPf+FUjAxRPFcd3tjHz+ftkC4sjNd2ZLEtks=; 25:LoO18dEYZZh/8d9bE4Cy8ArFmJa8qc8O/qT4sQqs5Q4wbfWutFxrj3e68GN7eZd9UigSNEbkDUpRmbOnmHGIEXZ0EwTzzC4efH+wdoPOsYDwK+hM/4KsWaPGTOJy9wSGk79fjjMqAF/gMdfn9O6H2bxcUFVrMBAH1H6TzC43PdhmiQdqAtpgiN4AeAF14DSZ0Vl1emecZDLzQmiJMl4ONpGC6tT9zZsPDrUu7QRmkXyUwEOUIEfWbLjFPjWJf7rF0LWs1wjGSqylDWMo5Mf/IUuy29dVBtSDPrRrIQ63SCLoIvbua4ASNf4aoQHhSDIuXfLdWg1IcE4f/RsU/kbWbgVUFytaDC9cfPo5C4PTZVF8GidLAJUnTWIWjwgzhheEG6q24FQzKzql2OIaRAJYyrL85yd2reOxaW9LQQbGAmKeWat3/9CSFkIMtPX/e0HYi795YCq8dm5ztbhXFmJe/g== X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 31:UES/kcxfc3IGJ07F9px+8gjehlstNLh57diYMzCSSW9vOOP1iWxnPuXl1/XYNeTrWK9e5CkJNKsUUFQFkzqO55i21Leab3T3fcESmhxwtKBlF5eKU3s5msmnne4Mde7RNeVBHv4qAEtP2/UUmmMPo3Te6Q8UVmJuyhp7A8CL8sRjydkKOWoC6qlhFQbBSI9/eYAf9Jk73BwzHoFhJG7mosI8ek964kiMUBbeXcDzYrMN3xWpiFnuK9WP2EAOPyH9; 20:Kp1jEP9TQIDBzzJvoWGBrrwFn5N7hzwWP7abU2GRYlDOZ9ig8TAZPbfMpamCDC3jUfe47eW0/dyQjb7+WzLVnzt0EiyuTDt/Yuyix4r0cUTnGiFe9iD0YR3AfO3xdSvIDyi1iekj4wJY9agREyaggwoZn/S4NHygtJ0lKBCFJPL+VWzqh6sgbDorvTTCvZhN77sFAAdQBLn8cP+skraOZC8ZoXPUST+Wi7nF/V/1pwyLUg0Ixjt3IqKLd1UwxmhrPbqjeWRB7vXitwOdCl8ppjngdkdxSZgjVYY8c9eFO9htduyWlhLM/CPB7xR1gW1fNsL9FLpqhmk8JLP+42clak60B3FRxyw24ALVxTeW4jEsF5jygreWrjmJeQ2Wt4LVzzI24Vrp4EJfRKP5KZsTlaTCdny+SCyoC1O0W37Vxh1PvR762WIDywU73IYVWTdcSs4dcGTirEY5VDOnu1a2dj4UvSSP4H4gseatCqjR7gfT1jubL4E5sFczaaMTHGdr 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)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(20161123558025)(6072148); SRVR:CY4PR12MB1238; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 4:b30n8XzWSb4CJXIFYjRS++U77s9R2R4qCq1oSA+Pu2Sq5P6jquCC0XUMldRyciKLE3JGbGGVVmqCRC6tNc2jQ46TMa7YQvImyGFylO+dhO6ufWS9l5y4lhxCBG7dmd5l7AOd/LeFLo93jdFvr1kjXrIWmcd2XyqAgJvDS1xl8z4+G8efj0jjHni8S9/Cnr/ZF2EDba82CbMGXifcvCMfY/zDZrzrNQDe50n7EyjY9MGnAbhJxa1zy346Rii7nsZJu6hZY+CtDrjFveCCEoT7/S5JAUGdfyK+JeQY+s8PaBgYsN8O+wjH0gdltYZobkTIFCdyUV2fjGReZnvQinS/U8rLEGoOeGVwum7nenoB8cR1nwmUo30lSVt+gyxE0h3mbPnszts8r9d92mzOkdTgAkItPCXd/YMTqVRhV1+/Jv654H2Ol3uxZuSB+SJIvKsFkGkCN5BGA+qXXiS7rrmfmDHClG1E1mHJ+gnxUEQqxHxQHZftupvREVvnfqL7GFQsWQKb6h76LzGbBxiLL+35Z9CU2fEujnRj9DEotTeh4Kf25bqxzMpDkjfB4Hs5QjIjYZHjSYdKIf+ZgHB4DF4VSDIzYHIniLPmb6eVhijLWj+MbIB+xa5egFopPhO8sBbIt9JpsQywZmxUpuh+9lV4Dljn3DTKbMxHJBpOowVCYYOOXGgF8l1mtXINtVNZ77ly X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39450400003)(39840400002)(39410400002)(39850400002)(189002)(199003)(305945005)(53416004)(105586002)(106356001)(68736007)(33646002)(5003940100001)(92566002)(2351001)(189998001)(42186005)(81156014)(86362001)(97736004)(7736002)(6116002)(81166006)(36756003)(8676002)(54906002)(3846002)(50226002)(110136004)(6486002)(47776003)(66066001)(101416001)(25786008)(53936002)(38730400002)(50986999)(48376002)(50466002)(6666003)(76176999)(5660300001)(2906002)(2950100002)(6916009)(4326007)(213903007)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1238; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1238; 23:KmaFrbgAKMTuWmAyGbH2/0EBUke5HU2tVWH5jpSst?= =?us-ascii?Q?pTYYIMLK+X5+oY8HcymXvqdkn4zS/OCHo9m8EmzDXK7zbbF2OyyzJHzlsR4u?= =?us-ascii?Q?y/Aaci7pHrHXyPd1WOgLxO9FldsEgOzrKPXC96IWGWUxiA2AktR7DaWbPZjv?= =?us-ascii?Q?pmxcZLi2tZQ/5wAr2Kwn0ONeWcS8JSGjswhh1aaTPvMpUvbe+omdI+HX2qyS?= =?us-ascii?Q?uo4f1B+zGXTs9tpK5vd6uTsECW8MRE/to0Ixtn+I7MeX/zpwM1FU+7dmF1DJ?= =?us-ascii?Q?KsAliME5NOUy+ZQ+L/agf4qGD142T5yR5iaiiISRGd0wErAFHjtsdVx6umFC?= =?us-ascii?Q?RHo4NjfFFclErVe07k8KXZeWyUJ703j8btkNgnCAXXCILt1CHxSwjRbldppS?= =?us-ascii?Q?Hn7PmLNlTZUBGTkOCUSH4i6T+1/wOcKZe/RNMYe4KHepqpbyR2gwmIXz4rbR?= =?us-ascii?Q?BxTUz7tQVv9gEMSXkTFJTUhmYZdGVJ2YuJRxnSiHyEVuclHB/SdemvrBpp4p?= =?us-ascii?Q?BQxFvPnnSNzXZpHU+zjDBxsfuFOS3PZRUbTtbqioS+doq3dysTwPagyfgo+F?= =?us-ascii?Q?tsl/8ZMOVpfqnwXSH4ohg/EQ6OV5yYpEEvspvRwYP6nQVTsGdKVoZYLmIo4V?= =?us-ascii?Q?goaYr80By1GqFasUZK0c9/kBp63HDY7F2CO09hNVnlaLzE0jnC4nQi+tooAk?= =?us-ascii?Q?dNIb7/8u56s0mGUsDTTR/ojnUKaEFCGttDf0Qmns+ntvrxIq1xnoKfciUuQo?= =?us-ascii?Q?GY4XC4SjYbB4yYtVauNV5Git0xouN0lNXtqHe+aUJW7VKMx41Az32VMsOGsM?= =?us-ascii?Q?RNqbbGyJBv6ZYg+CVpabykkQb2g6dYgCP6rV5rf2ue4aQmgvG4yvppBbc1fQ?= =?us-ascii?Q?wsuLwaHOqHQESd7TYo6qOsTTefjO/3K623SpCjAxUMpbfFW4XDk3Kq/pyWek?= =?us-ascii?Q?V6SVX/4EH4DhYYbDnMUXYl1ChPs/alQhvXDsNBj6ZYPGjwtGGuX4X4cFSZJa?= =?us-ascii?Q?bXRiL/ELpFDy3xKkGqphJf6YX9OFg+yHtt/wtIe+15UeQDoDpCZt5F7GROTp?= =?us-ascii?Q?YDW9mFUYofZy6S1k8xr5hCc/BGUGupFSXZgzubnwYauUEtZys+p26r7M2tPJ?= =?us-ascii?Q?KSxJ7nW5rh8zEdeaXQc/EqqwLS8pyOi/uzQGH5THmWe7HDq0xcNTpSm6/Nt4?= =?us-ascii?Q?JYn7jxrYyy6FlDIvIiHWPgnxawO4Db8150kXYdpl2+dptSKbU0KY1HHayx4M?= =?us-ascii?Q?tFwGOCMmG3uYXGtxJHYIw1QoByomnUrbdAOL6Xl?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 6:6wOumkrfQhlcC9St32DeqXo/F6dZkwlhR9spzIW4Y/XPbw1MirRXbuIEu06hh8ftfsdi512p0d6BBjA+9fqtnh4vJUX34G3pWdoYzV0BqMMJRRXbRAGOLEnR9ZvvAwN8LjFWDELa+7lxU19jZE71Bnu315ArwYrTJ7ZdBWSpX9uOZakN32jMaPsq6HlWtn+QSP/oiYMCv3pU9dynHm+/F9qUC6UORR7jOJHjOOzSfgBOT6QvRKSh7+UT0QCqFA5XCVNonw7nTNtOJZf4gADpoZ4loKzmkQ2L+6BIM7pCUOXXEFF7M1Kg44IjyCcI/0xUQErGmAIfUnDcGk9WiM9nzGlKyr4JKqf58k7IabzPXLdn12B0COefiirjcYk2VeTFKANSWJUqr2wE0XnLCcabh4EFl2n/3/irl4ZGDBZkJb4=; 5:3Svhfh/fC476d4tCdXtsvoUAXF/JpDD44TZ2YnB5ZPRZDqlw7NcalYVHwCBwWn0UMJGl+A1/fCZjNw3DzFNmzN9DxrhOumdPipBiQ9TwshrXJHn4ccRr6SK/zCB7giVoqeBl0Wag++y16gcC0YNZpw==; 24:0Q1z493KqErGkwYxD/5myiZn0kB8ExXEYs8UIcs/KaNcsIqB+afvfZ+Hqohepdp72V5HYMgHLTOm7CxE4ebcMvSbY3WcR0C3pwsoBWqL/Tk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 7:ZM+ExVcKUVHiuebHYXXa6WvfmK+TZ4W4pFKxR/JeOG90zD85jHysH1zgBWLIz2wVIThTztScVWwOL2SOq5V3qMmEFgQYhX0gWhX25mYRz7f4oAbe3Vqkz+i2Hlcdna4U+6VKG7/j9MfZaVIdesbc2c7lkDdPcJDg2Njx9/21ccSX6w02FEb/OKv5Ut2EeJ6Ptukgzr45QvSMZCVPwvczx6/0xhR3Ty9BEAAThiAalQ9Zop/srwvqirhMVALzBmhaH7pIAFhc01qjoFuz5Uo9uE0yGGWlxBIlfbt50BRNe6OnQ8u9G0Yi9LwpbzS49A7mIEDzkSgjWBfzEGnjMa9kCg==; 20:yJdDrivOLcG8vnJ7fL+nL2zahoJAsjRtqjwBeh7EERSFFIVFvr5W4l9TOhHURkXFWmro7z1bTtxAKnouP2UOiu3f4+1O7qLNOo4oDnX+UhUmol0QXaLf/wpXUUmx4rOmM4qDxJc7+8z1tsYDFwWcQcRs7C3Snfr6hXq2M4b+9LEIkrY5COjRaA5w8gTPVHWk0zJbYTmifa4A/zBbKRgcUYcMiw0w/GfI8ERN2/DFNSthcR/lYoLKsV1XZUuvl1kU X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 17:43:20.3382 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1238 Subject: [edk2] [PATCH v4 4/6] UefiCpuPkg/Universal/Acpi/S3Resume2Pei: 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 are created (S3Resume.c). 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: Star Zeng Reviewed-by: Jeff Fan --- UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 17 +++++++++++++= ---- UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf | 2 ++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg= /Universal/Acpi/S3Resume2Pei/S3Resume.c index d306fba..a9d1042 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c @@ -5,6 +5,7 @@ control is passed to OS waking up handler. =20 Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions @@ -58,6 +59,8 @@ #define STACK_ALIGN_DOWN(Ptr) \ ((UINTN)(Ptr) & ~(UINTN)(CPU_STACK_ALIGNMENT - 1)) =20 +#define PAGING_1G_ADDRESS_MASK_64 0x000FFFFFC0000000ull + #pragma pack(1) typedef union { struct { @@ -614,6 +617,12 @@ RestoreS3PageTables ( VOID *Hob; BOOLEAN Page1GSupport; PAGE_TABLE_1G_ENTRY *PageDirectory1GEntry; + UINT64 AddressEncMask; + + // + // Make sure AddressEncMask is contained to smallest supported address= field + // + AddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PA= GING_1G_ADDRESS_MASK_64; =20 // // NOTE: We have to ASSUME the page table generation format, because w= e do not know whole page table information. @@ -696,7 +705,7 @@ RestoreS3PageTables ( // // Make a PML4 Entry // - PageMapLevel4Entry->Uint64 =3D (UINT64)(UINTN)PageDirectoryPointerEn= try; + PageMapLevel4Entry->Uint64 =3D (UINT64)(UINTN)PageDirectoryPointerEn= try | AddressEncMask; PageMapLevel4Entry->Bits.ReadWrite =3D 1; PageMapLevel4Entry->Bits.Present =3D 1; =20 @@ -707,7 +716,7 @@ RestoreS3PageTables ( // // Fill in the Page Directory entries // - PageDirectory1GEntry->Uint64 =3D (UINT64)PageAddress; + PageDirectory1GEntry->Uint64 =3D (UINT64)PageAddress | AddressEn= cMask; PageDirectory1GEntry->Bits.ReadWrite =3D 1; PageDirectory1GEntry->Bits.Present =3D 1; PageDirectory1GEntry->Bits.MustBe1 =3D 1; @@ -724,7 +733,7 @@ RestoreS3PageTables ( // // Fill in a Page Directory Pointer Entries // - PageDirectoryPointerEntry->Uint64 =3D (UINT64)(UINTN)PageDirecto= ryEntry; + PageDirectoryPointerEntry->Uint64 =3D (UINT64)(UINTN)PageDirecto= ryEntry | AddressEncMask; PageDirectoryPointerEntry->Bits.ReadWrite =3D 1; PageDirectoryPointerEntry->Bits.Present =3D 1; =20 @@ -732,7 +741,7 @@ RestoreS3PageTables ( // // Fill in the Page Directory entries // - PageDirectoryEntry->Uint64 =3D (UINT64)PageAddress; + PageDirectoryEntry->Uint64 =3D (UINT64)PageAddress | AddressEn= cMask; PageDirectoryEntry->Bits.ReadWrite =3D 1; PageDirectoryEntry->Bits.Present =3D 1; PageDirectoryEntry->Bits.MustBe1 =3D 1; diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/Uefi= CpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf index 73aeca3..d514523 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf @@ -6,6 +6,7 @@ # control is passed to OS waking up handler. # # Copyright (c) 2010 - 2014, 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 BSD Li= cense @@ -91,6 +92,7 @@ =20 [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ##= CONSUMES =20 [Depex] TRUE --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 01:16:51 2024 Delivered-To: importer@patchew.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 1488131014558363.04872553210566; Sun, 26 Feb 2017 09:43:34 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 0A63D8214C; Sun, 26 Feb 2017 09:43:25 -0800 (PST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 72B0282126 for ; Sun, 26 Feb 2017 09:43:22 -0800 (PST) Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 17:43:21 +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=0eyFS4CMXB2mAYgteKSLrCpaXg6yaFhCjCgQYFLhjAA=; b=N0JQ6EyHvgKgSvR4iQDLY1Jm7RVv0hknx7kK+fVJhuwBaQZaJSW7L/XRtPVi788MPmRx7vRJ3rq6qEDzZh4irXkA48+oykwiEiuMOyZoh6iExhOa2uNOOEfn84+tJY0UKWrJLCM5jvgA0vR7Bfcm/Rlc7ToPMxTFaIkya2ZEa0M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; From: Leo Duran To: Date: Sun, 26 Feb 2017 11:43:06 -0600 Message-ID: <1488130987-2544-6-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488130987-2544-1-git-send-email-leo.duran@amd.com> References: <1488130987-2544-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR13CA0028.namprd13.prod.outlook.com (10.168.240.142) To CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) X-MS-Office365-Filtering-Correlation-Id: d1faa4e2-e2a5-4b8d-e6d1-08d45e6ef4e1 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 3:qJUo1qM+UYUJeZxKjFrQH+CVg0EGPkxSt089v7bSqhzrv5JD6HxWMyd1QzLFw2tiZpgLTQlb46KGMeEKj4o2P+oaTcRyS4LaSNL6UT2mOwAid4RP60yXGEqU40PuO6Mz5fmuvjIaXOO5kzZESU99vvp/xjGEfYSf+tbkNlQrD1Rv7PzyRikyAZA5wiNs0RVEj25f4wBOO9DLYzCgtfuulkRSKfu6gMgV30bLy5uYQX9K9SpXy63yl0AWXOBo5mZrBYAa55O1RrW8HF8p/DMCmVvhKOdZgq4+SCexV1vR3Ug=; 25:anuKoUOTsyq6wYedMccZSmdqt6xLqRYN+uivs0OkNTFxEpHQGtLeRJrImDd1FfHTovyGjAIDtAmUOEAqU9Afhs0F/Tv7m+tLFG4gRtPTvJb6zNxn9eLch5W/Vt/xDn1yqB6xXJME9Xyk7FkpMt5S74tkp9I9M506uuB7JnJ2EbbZDNqxYRmlKgpPS7AqkIKjwWmcz+VfcvltV3Ou4xLGG7Ey3xtK34nZG1E+APFm9nF1mRbzFoerW1rZxKi0HlFu87qjpatI+xtFuB1cDB2w80nZm9yqSNbwOgMi2jcbr0PkNH9w66MsthvKSTjCj7+ICIigZ8ZqjupYXVUFp7JJjijPyvWypbgcW93AQbtuH3babjjMHz5bE6arU0F2rGz6Ms1umM00oRVlOmocJH6KPG31ykqZA2CHljIdppfqZ4zsSGlGser4MyLGLUsmTpAB X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 31:GBLFOwAtAB3ufHajV66xU9qtIpUBsAjY1Zs4hTHpiZtv7uQLTn7zhySl6+OfkMkVAYw57Mzr4HpWYPt2oUHexF77mV/p3FRsfvsep+AUqv7Vv1buWE+6gu6EpiA87526rbRwAv5PUi9yi9swwc1stjYDZttZ8NKubCdqzfZkRIYR/olKf4QqFAc192H6dI5ay5rVNWTf1s6N5YNCfUE4JT11EZ8p7cZ7D3G64Dre4DE=; 20:a5DlJ89bsIFVQ/+/YVwLLQJO37EBNOVPIQIK/d7s9QV15IqqdlR9c8PFZtbspEGqT7/BXt7EQIMHdWq4cCPMYUzz4N5+vER+Fbg3TcQV7DNUQmq+I8uTRA0cSRKAOJKPcyijOZHEr4QVJWOdCit//l6pRxNh5p3NsBpc4NHwEBbi20q/9aHRwgIlDZiAhSBXLX33QwW8RFYlw5/BiHcYVJnaLS2EjOmOaA8rg46cIhPShyngsCydOewaIHLdMWToEjA7nSzoCj+4O9t2SJuTOdZXil+eGhhcD866enQXUpi/upQ6zAzXag0FZJkHSFftHHWi4x20zTyEYWg1qlrRNyLkoYcG5hxdS3CkhOL0+YQO7aPljAKAa9gV8CGG+OWLn+XD0Mf0tHaAlweBEgjJeeKj4IrubLviTbfMCuNy6kMx4ma7/yimjkPXVnVbjoj4Ddj0q17gWE3HUVA5UGKhZE4ej8p77p4IoMYqGaFWB06EaMionX6MR3JlI3mhUIGD 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)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(20161123558025)(6072148); SRVR:CY4PR12MB1238; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 4:k3s8PhPMrKM3PdSFIZAhhnw7tueVCw4VVIpyX8UQRJ8swzItI/AkjoPDqc6mgVHSzbZaGsKUg5fQ+oZ0EnrZ6MlXQ7K8uaS6Fb983xQdW7XUfomKCkEVbj9+iyLZtBk+ow0RSzK+iiDCH/nvmZqyTO+RFWAP0IGGB8GVffS2jlfEw6ek82g2CzkgZQHtcQxYhFckKKlOolz3Fxg0mrGSlxbsxdwHnapVr7CKRnVP4ByxzHYz9j1QdHRw0ctELke49WkY9jsd0t5ZwOcJKjBS0vusFZpJlXTROd/kLt3Ou23lGnqASaEdvZeF47o0Y0as4AmX+olKOIOrPf27fIWVX8sZW57b3MUsgKx5lnGQYwVhWc6QawL6Wr42KhwLle4iEAt0AyWkjZ1NKtHbgVQopcroGtfFsE7av+h1v2luvhQK2gd/2qoEPcxrEO9u6AaaYew59w3JKVbTabX5mOY/oyyoaNpiEJB+RQQQ4wkV+g+1FyBowVQ4UmUxpAD50tXnzpVZsI7/JAmG6oXt0RHJd+wrzUZOjfZJ8E3rvq7a/vDh86YOTanHOmtvasmzYvrr/RwfwnXeshNuM9eWBrZTsVkIlSgfVOLPPfAdg7oey1LgHIXkpLEe1DpWeFgLyO311uFfEmmc+8t3QrqOOG4sQUFauytoo87U2AHACn0AL+tlN+Duu5iKZANUyiTp3dlM X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39450400003)(39840400002)(39410400002)(39850400002)(189002)(199003)(305945005)(53416004)(105586002)(106356001)(68736007)(33646002)(5003940100001)(92566002)(2351001)(189998001)(42186005)(81156014)(86362001)(97736004)(7736002)(6116002)(81166006)(36756003)(8676002)(54906002)(3846002)(50226002)(110136004)(6486002)(47776003)(66066001)(101416001)(25786008)(53936002)(38730400002)(50986999)(48376002)(50466002)(6666003)(76176999)(5660300001)(2906002)(2950100002)(6916009)(4326007)(213903007)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1238; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1238; 23:0d9YLrRsjxSZFZRLLrVej4owisM3Bzs1MfQZaQj/X?= =?us-ascii?Q?WsTcpmPPLVbzjXMWRG7txb0H+jLmSK6fAOBFm/fathzQ4goJfTccJRDgxijA?= =?us-ascii?Q?yCf0iM/rcqm0Ry2cbSOtTYLj7jp9UD8+siXMPCrdCnJ2xE0zr6mk3y8baQBa?= =?us-ascii?Q?F4V5IZDf7kjzWZbH/Mx9xI7hAS1U4atYKhf4Glik/UvOvdI46crwXBIX06ef?= =?us-ascii?Q?yTnqvRAcRkxv7mSLK3pBp9fa37fWhAOyrlxCeDURvqOSqttRwdRnEiJ5wjqr?= =?us-ascii?Q?lDJJKpG8fyMpRWYbdPpcWStudWYED8h/EwyvF/swZQhP0yPI//4q/RMzmPWV?= =?us-ascii?Q?xj8h/jqkljylthamKLJLjsnY+cp55km9hU1gs33aWnyIp/9S1+iov0gTVkwB?= =?us-ascii?Q?rFbQYIaaaSof+ftXgmfbRcCJWMdrB8d44iiG8UZ0qKUJ17h81h+xdFXzCIUE?= =?us-ascii?Q?FdIXWCZxWMBmSHUyM/h+UtoCNTXh8j+PNfMeI2nN5qzpI01omdhENK7YGI1W?= =?us-ascii?Q?TauAq3bXgq0PfpbQSgFN8H8F1A37a4cljqTwyfXMzg9QMJcunONOWObSRYca?= =?us-ascii?Q?Wtmb5ev0n5oxELrDQvLkK+qNSu9VyyamC8HItSQuyMuLC8uEZCBdnb14EiOV?= =?us-ascii?Q?f5r7KtBTqajdFp+w4Q2Wx55jP5GEJWGram6pI5UZX2tvD6YHdRMyCdwwYbJ5?= =?us-ascii?Q?yFFAHHuiEjfHxD2pnFo/UX9yuN4wsviNt2oObTRDfuMm9CfHpiORYrxLBPhs?= =?us-ascii?Q?QzcUb/7efqS+7dJ7ux6g5suc7JSPIO60XNrIRMwwt3BB7bxA2r0kpk9peJIC?= =?us-ascii?Q?RcUYNnnOTJYnX9OCpQFitHJHktpwPN7/LI8B6eghOsl7KA+VuG+sSH/+os5T?= =?us-ascii?Q?n5uaLLU+7C7eBuaS/6GfexRQcYwZIUUX+tlQGxIVirkJ2TkcXS6DNKUTeHp7?= =?us-ascii?Q?oK76LrRsG88BkZ5VRiaKGsC6ZKKK9bbmU8nJd99tu761HqKoH2cL+948kw4f?= =?us-ascii?Q?lsXEg3KmS/PyIwg2HXT2iA0fEM5iOXlO3TGcedtuHjDVYODU2irImW+RIJjo?= =?us-ascii?Q?m+8H1PrClr8IgjrJ4rOsm6ILPkW4nnJCz+DPYySDSV99O4+/F3fKHUcCysQt?= =?us-ascii?Q?lXnGNbwoOd4j+2YJ7w0cKwyDeqGG6AClOYNIzaZXMKOf45K7dUezCaTldxRU?= =?us-ascii?Q?fUA4Iqy0mpbkCS1Rqkhp/A5IDcaDgoOa7gLXe1DfM0vZfJA6YrXCtzIWLExi?= =?us-ascii?Q?+K7o8skNQj3ynmyCvNzK7QKhgrARdGjLA41LIfL?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 6:HRGiLkM/SAkA/mv8+hToTuRJaMlCqfkrRrZJcEojyo4tCeHoIqC3EyHWf/A0Y5j0BpnixGgcFJ40/CHpBBbBxm/XYzobEB8hOtlwuLV2Isoj12OCorJ7ldZwnZBsIzzAkBmnAjCGqKjLcXN40vSGir7fNr2hDBts9taK7PDo2QppA3Fq0ZVzNp7nsDjCcpcHW4jWoq/Tzi0EMAepUUm2azBRVbRgWuyYhgB5HC9xi/HlYNeL3on0kHN3YiMX1w2+9AKC5cG58dyV1Zu0E0buAtXLRvLMHPgCXEJ78ZNsaco2tMaR29nvSHbtr+KeeoHsp1MkXxGg/ucLxv1LbZAT3PGm73ybRBVIZkcZTJ5+BNcljweILb2ITfsPJ2CTzCYr2bAA+rGg+kCS8esAvpBeIg==; 5:Yr1xCg9iRgDoFLG55t4hVwv4PbxjZ5yyAHusO3AiCu5n0T9jBz1UTQczc6g2fozJUSdZ+R1U6pHBTjAalL9ZhkKHgjwOC2B48Y+PKctbxTauQ0EiVK9VSk4ucAJVsTAZJWC36MDMY/J5+YEyZw0PXA==; 24:rKsdoKKzoxU62rfZpnpkbWnYT2KIda0lw7OHPFugkAWI0+PGNQ5KvHWVF3Ac5rC3USc24q9nYhGL6u+BLXyVOa0CsQWFnL9PlvtTnTCEBrg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 7:Bg1VL5JoPuu6SQq3WMjXcDoflPOotRP0B6GbDsx1u17G6pDfgU8HMvuKnOIMs1Bi6IatUZ0tB9S2XBOerMhr1zXW7c5difLDbtE6uHWu8dVlYG0HWCuiuKYinqEZyAO/3gtg9PVoFaJtLeDSzlNigthupOxda474aFlI/nKil2uNXNi4aehcbNyqt6b4ydonj7FfRv0u4evX3ILIoOwGSt29jUPJ/eeFu4CD23p5+jE6Zd9crUOVupvcThs/r8jeqJQQdzaT6PFvPbBHptbgB7qiGuE2bOL8etg+Y8rDEYtEqaPlWVoJ3MjWCBWA0uWSQnGMfTss2tvmXsus+AwmzQ==; 20:3NTjlUn3k+Zk9FU7Im0PEi69paR6fg0ElardmolF/4eDlnVk89ULwzjdD5Xh+1Kz6Wpp4LsA7LUakVhRPi7GNLtjVVG5pFNcdzk7OJXbUw0cwDdYDy0UJoOoLWzhoLLJrzXHoDd2mE9LI9dkMJayUJuP+vSi9HHOxbHEMvVPqHqRh8fhsXE7YXfjL9RbXTxx9xRJcSFAnaUgNa1pRyAJzPjX+g1RXcZ5jIgppAh/UFDaIbXEQpvJ0EL/caSMSSdF X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 17:43:21.0688 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1238 Subject: [edk2] [PATCH v4 5/6] MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe: 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. This module updates the under-4GB page tables configured by the S3-Resume code in UefiCpuPkg/Universal/Acpi/S3Resume2Pei. The mask is saved at module start (ScriptExecute.c), and applied when tables are expanded on-demand by page-faults above 4GB's (SetIdtEntry.c). 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 --- .../Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf | 2 ++ .../Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c | 7 +++++++ .../Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h | 5 +++++ .../Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c | 15 +++++++++--= ---- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptEx= ecutorDxe.inf b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScrip= tExecutorDxe.inf index 7cd38cf..29af7f5 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorD= xe.inf +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorD= xe.inf @@ -5,6 +5,7 @@ # depends on any PEI or DXE service. # # Copyright (c) 2006 - 2016, 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 BSD Li= cense @@ -85,6 +86,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIM= ES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdMemoryProfilePropertyMask ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ##= CONSUMES =20 [Depex] gEfiLockBoxProtocolGuid diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecut= e.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c index f67fbca..22d4349 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c @@ -5,6 +5,7 @@ in the entry point. The functionality is to interpret and restore the S3= boot script =20 Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License @@ -23,6 +24,7 @@ EFI_GUID mBootScriptExecutorImageGuid =3D { }; =20 BOOLEAN mPage1GSupport =3D FALSE; +UINT64 mAddressEncMask =3D 0; =20 /** Entry function of Boot script exector. This function will be executed in @@ -408,6 +410,11 @@ BootScriptExecutorEntryPoint ( } =20 // + // Make sure AddressEncMask is contained to smallest supported address f= ield. + // + mAddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAG= ING_1G_ADDRESS_MASK_64; + + // // Test if the gEfiCallerIdGuid of this image is already installed. if n= ot, the entry // point is loaded by DXE code which is the first time loaded. or else, = it is already // be reloaded be itself.This is a work-around diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecut= e.h b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h index 772347a..7532756 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.h @@ -5,6 +5,7 @@ in the entry point. The functionality is to interpret and restore the S3= boot script=20 =20 Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License @@ -44,6 +45,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. =20 #include #include + +#define PAGING_1G_ADDRESS_MASK_64 0x000FFFFFC0000000ull + /** a ASM function to transfer control to OS. =20 @@ -87,5 +91,6 @@ SetIdtEntry ( extern UINT32 AsmFixAddress16; extern UINT32 AsmJmpAddr32; extern BOOLEAN mPage1GSupport; +extern UINT64 mAddressEncMask; =20 #endif //_BOOT_SCRIPT_EXECUTOR_H_ diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEn= try.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c index 6674560..d433cf1 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c @@ -4,6 +4,8 @@ Set a IDT entry for interrupt vector 3 for debug purpose for x64 platform =20 Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2017, AMD Incorporated. All rights reserved.
+ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License @@ -200,14 +202,15 @@ AcquirePage ( // // Cut the previous uplink if it exists and wasn't overwritten. // - if ((mPageFaultUplink[mPageFaultIndex] !=3D NULL) && ((*mPageFaultUplink= [mPageFaultIndex] & mPhyMask) =3D=3D Address)) { + if ((mPageFaultUplink[mPageFaultIndex] !=3D NULL) && + ((*mPageFaultUplink[mPageFaultIndex] & ~mAddressEncMask & mPhyMask) = =3D=3D Address)) { *mPageFaultUplink[mPageFaultIndex] =3D 0; } =20 // // Link & Record the current uplink. // - *Uplink =3D Address | IA32_PG_P | IA32_PG_RW; + *Uplink =3D Address | mAddressEncMask | IA32_PG_P | IA32_PG_RW; mPageFaultUplink[mPageFaultIndex] =3D Uplink; =20 mPageFaultIndex =3D (mPageFaultIndex + 1) % EXTRA_PAGE_TABLE_PAGES; @@ -245,19 +248,19 @@ PageFaultHandler ( if ((PageTable[PTIndex] & IA32_PG_P) =3D=3D 0) { AcquirePage (&PageTable[PTIndex]); } - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & mPhyMask); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMask & m= PhyMask); PTIndex =3D BitFieldRead64 (PFAddress, 30, 38); // PDPTE if (mPage1GSupport) { - PageTable[PTIndex] =3D (PFAddress & ~((1ull << 30) - 1)) | IA32_PG_P |= IA32_PG_RW | IA32_PG_PS; + PageTable[PTIndex] =3D ((PFAddress | mAddressEncMask) & ~((1ull << 30)= - 1)) | IA32_PG_P | IA32_PG_RW | IA32_PG_PS; } else { if ((PageTable[PTIndex] & IA32_PG_P) =3D=3D 0) { AcquirePage (&PageTable[PTIndex]); } - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & mPhyMask); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMask &= mPhyMask); PTIndex =3D BitFieldRead64 (PFAddress, 21, 29); // PD - PageTable[PTIndex] =3D (PFAddress & ~((1ull << 21) - 1)) | IA32_PG_P |= IA32_PG_RW | IA32_PG_PS; + PageTable[PTIndex] =3D ((PFAddress | mAddressEncMask) & ~((1ull << 21)= - 1)) | IA32_PG_P | IA32_PG_RW | IA32_PG_PS; } =20 return TRUE; --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Mon Apr 29 01:16:51 2024 Delivered-To: importer@patchew.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 1488131017423928.1696558793726; Sun, 26 Feb 2017 09:43:37 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 42FEB82130; Sun, 26 Feb 2017 09:43:28 -0800 (PST) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0602.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::602]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A20EA82126 for ; Sun, 26 Feb 2017 09:43:23 -0800 (PST) Received: from leduran-Precision-WorkStation-T5400.amd.com (165.204.77.1) by CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Sun, 26 Feb 2017 17:43:21 +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=rSytZUIvc6JLROLgXXtKMHQUsdrjBz4UD9cJCsgmRjM=; b=u6WN/5uI0TbzNmVGJOj3RVOH995At8OOHxDZhS3zRig8mJ/gBj+8IfKIVLP2mHQ35vySxo6R6JetcB0iniJepcFl3PlXhb+BEFLGl3oVEThhS+MPrIsVIY9DdoZFbMRMnEbHqk5F9ylSsDTfMhnrFuMCWynZSWgZXBI77YGz6XE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=leo.duran@amd.com; From: Leo Duran To: Date: Sun, 26 Feb 2017 11:43:07 -0600 Message-ID: <1488130987-2544-7-git-send-email-leo.duran@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488130987-2544-1-git-send-email-leo.duran@amd.com> References: <1488130987-2544-1-git-send-email-leo.duran@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR13CA0028.namprd13.prod.outlook.com (10.168.240.142) To CY4PR12MB1238.namprd12.prod.outlook.com (10.168.167.13) X-MS-Office365-Filtering-Correlation-Id: 2f2643e3-c42c-47f1-69c7-08d45e6ef54d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081); SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 3:5T9AIKxoqHx1DKUUeGul64BUhGd9YUgb+j2pPnrt8osZDpRFAgEPSBnCPksLelSJahruUAXqGmtkKa8lQU22C2esktYulnZOiMCY7JLa22oSqZwA0ESoddyrLOAKajcG/PvGD7Xb/CdmpoCTgehsPKI+NWe2tL5XF8T5aqezfAqZY8K7TgqClO9gdFnqT5msOZFHK2Wh0ok90kJ/fTgIeJX/qAz2Z7E1/SYjl0TvLYWcpbykJh8DrYvKvttO5n31yNbcYnbaPNvDtA22EMRBlC7zYn2t3YAIMPiZo8BWoyQ=; 25:lHCl126j6UcsDPkXa9U3r/AklgeC1g+GY5DYd6KFjKINcvO6hxjLSwWh0KRkdoA+yGogDb1Rw3SYZ7PHk+A7z+8yO6xe2jFCLUJeid2XuyMPw8cD1lZMW6RvVFL5SbhD5cmfwyN2mImCteaV/uSh9Y0kkCVIElOSToTlgaqH7Qcpj/m6SgdgKWJRnlNTRUIKjPJBr0RaXeC9PUmUKYrSQ33WCCWah/dg2K7ml949xPIwEcbJiOgR4SMKyEZcdXoR6GI0fUu8ZP3oag0KwRoOL1moe0FDkUDqwTkFP40hPD8FQSm5Eo7N2g3atHVmUrtmMz7ttfklRzr2kMZcTIPWqplpUHzjOjZ3TQ/PX2oruLUXuiO/o0eEbOZrxio0qpLMWcUDR5U6U8MAIe9oVoJR+3VZXm7oZBvH1yU0FigVJD3Db3G7EfddVnW+3rP6OEuyDHz2yHCmzuVHdAGsNYwf1g== X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 31:wwKoPWM5WEa1iye9U0EIYvE401mnTmxxWEVNdNOatVqLSmurW46aK5Oi+v5KAo16MNnCJ6J6rN+UWFk16JnajToxCAKlj4Hfj5gipnls6v7htzcrPW2VkdaGE6PyrsrtHo3mpn6ySt3C4Kdfeg4xJyZZ3SVyXzWwwaeSgt0qci7OvN3Y5wWXT0ymRj86bpPw7grLZSD/CZR/bgoYAlg448IssfVSDcCLj2e9EKbSao9LDnf+ahU5OlwA6U3p5btQ; 20:ivNIeIITfEZp5ddajRKxb3WxqW3uh+NOEKYdU4IOMXvOiTkJTVG37fg6w5JFK4/U115roMNyErk29Po3YNT4aUwi31iJ0Fq29jnxLzWsCJkAB1+EsyZ1x08/vkEqubB0nckc5OP70CF8R2gnVVvy2F0z6+hTVM1ktsSHjTnD3xw4n7iejli49fdNxIVPEV3sPG51CfePEM/yU61oA3mEpIH5FwjrMvIXNGK0sSpaz0L5z6nx83yFwZ1VRqVNCeEUaaM8vD+EFpW8G8LWqEqvrroz3Xx5L4S1nORkNIHSeL2f6nUJwnfW8QG8uCJ85SnaPfBQXQjloi1MDUZJDpPa8Lr6GdeDlqL0XlcRFSbxzFfDHkmtZEdtFL0MDIMmYMgMOpgkd+qs8kjByiPcHJ5wScyTngNDYpffeNCQUz1zJ9mnWztrIAcZXCgsSos9Mwz5ujsMy5FQN7XMa5fXhIGJV3BBAz226frtyoTZEYNAh5RyOqpZG15q/8u+cjqpmZkU 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)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123560025)(20161123562025)(20161123564025)(20161123558025)(6072148); SRVR:CY4PR12MB1238; BCL:0; PCL:0; RULEID:; SRVR:CY4PR12MB1238; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 4:HTqcwdCfXK8aU2z0Iv+LDqZrlMbqepaFzELvqWj62/whEZq5Bvu/P4hw2w0Cp/irE56ar3s5I4RF6GwyfPkUJuwShX4MPAuzIOLGIu3HuRu9nuZumiuGjXfqMsU9L1pOCgZl93pMZprtx/fKI4zIX09bHQ74/U2sIVyL/l1F4aHZRB5KgIgb+Qibw546dMgcwD2GHNmjUB5WM4JiCRmCk4JF/Yv1WzV4nnoyWmosjbA0d8Fk7DjiokNzdLsOG2BZTbJ8zHxEEE+8Mw4KChwqcfHjwMMpKZ8UeET7JtuLFbdMRR4qeZM09GcHbGZh6x1UC8I9+y0sFFREer1asH55aIcRNpg7rrsdwgTYZdY5M8sRz/JZvCzKQ/KwAUeEMoCjPuUdCRMo4FxoPPvzf9mZO0a8VGK/BcwoKnpanuDHo6bdNr2+y3keWA3FXwQXHQ/rRN69Ep3VbeDE1zxYlVq/Ak2CnULhO9AcF7xl1ZiTxGGEgFzD7SpcU0SolKCSfOdNw2HSPXGmLO3dXIeL4YLkaloUwV20Gre3xeEf4k3C+yJ18Gd1gztubyI0SLFgrmjajl/WghZOZxGl6+i3w+rNkhZK0H4B6SezlcPgXCslGWOgwY3TA5DywE6aeInkSM07PYpvg7ucmA38caLQprhYkTUm7woCnkvUWfIAWwEjSTRc6J9OqshhTu3QFtca1dXqee883ibPGvvX2ggZ7g0bwA== X-Forefront-PRVS: 0230B09AC4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(7916002)(39450400003)(39840400002)(39410400002)(39850400002)(189002)(199003)(305945005)(53416004)(105586002)(106356001)(68736007)(33646002)(5003940100001)(92566002)(2351001)(189998001)(42186005)(81156014)(86362001)(97736004)(7736002)(6116002)(81166006)(36756003)(8676002)(54906002)(3846002)(53946003)(50226002)(110136004)(6486002)(47776003)(66066001)(101416001)(25786008)(53936002)(38730400002)(50986999)(48376002)(50466002)(6666003)(76176999)(5660300001)(2906002)(2950100002)(6916009)(4326007)(213903007)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1238; H:leduran-Precision-WorkStation-T5400.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; 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; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR12MB1238; 23:GKOu01hemxbJ5PvxZUeoQ0Fl4y4VcLwGOzAGcxAth?= =?us-ascii?Q?rjV7EoisGu/Kjh0m+CSMt2XHJFAw9oNeR71p/PWKVPCzhlAafzeNl7YDpkUH?= =?us-ascii?Q?SsFMj6vyQqoSwLFMovTgIpGyi5iLR52YdnD+Vl+EsMR2AdPf9oR3OCejT7OF?= =?us-ascii?Q?phwwXtPh3CrZKd8LKQ0fEhyzi9ZGBbkD0XwY9X847Lc9k7GAh+crfGJimR2V?= =?us-ascii?Q?gY0zHcUNqPFIbeYDW4y92gdAn2stC25aqkYjcwkeFntkQYRVmK3hnFdWTp6e?= =?us-ascii?Q?lBgFZTKeh3PPOXn79Pcutsj19Y88fSLCKoLL0ROmtbLn/F8oTaQ8mJswemf6?= =?us-ascii?Q?YuokIiFpX2fIew4XTj/XhLumVYz15fC1PH1Q7urZpL7DVoWcnh9eC48pgju8?= =?us-ascii?Q?+2Xg+9u4JoeI4S0DpGvUii0ycNDFBCicRvzSxPcT1Yls+/XrcpduL60KDkdS?= =?us-ascii?Q?HLG+yo3luiVXyu9wO4k2W72GErheqAScEpVbZSoewWTmI4Pry4JzqQvffbQt?= =?us-ascii?Q?W7sxOb1WDpks8oLR2FnuS6/aPyKLeeXb5Bm8iJ8GBeda8mXUXg2Z4ectVMfS?= =?us-ascii?Q?TTBIiI2rUxr9YrC6hKl7sAwQvFoiO/cgYe1jKxsQu9wFADy86/DP87ByNGAi?= =?us-ascii?Q?+62P8SDU7E2uIuerc9xY+fJ00OZqeV+Kg0EwoNjDHaCtrUlRnneFYd6rhLHp?= =?us-ascii?Q?obafIhzDNHDRgzF5P/ZSH49CKoE9voBQ1EsaViRnQ/sqSv9835SJ0CEcBmRe?= =?us-ascii?Q?eFkTJNHOQ1u/hwyZ8wjsy9hpJ59Tjeq8C32S2mt+MpIuwumZZMqDkfQjnWw8?= =?us-ascii?Q?7R1P64tyCGQhoPgun/sfONsEXhFCHZParPfMV5099WTjl5gzdZhp5xjseHsr?= =?us-ascii?Q?e8+z8ZyrnOYjCBv7fE887ulQKM5x3kGDp/l0nZBl1AVczQxCijWrMDf7jXQz?= =?us-ascii?Q?GNyY0jjXryhh7jrldpJ+yFUoASXkq5J5XRuex1BfPLzRSAVPRtCcjlIkrvx3?= =?us-ascii?Q?KOMJPVqB3kdYlxweWAeGb30Ys3UMPOMrKgcXVrLOXxQWqUEbJEg4lxd/+4ki?= =?us-ascii?Q?Lx9shCgw79fs21LDX3Riy2S5M7k9+SbHdtWkxY0biu1F8AWzNS0XPKvPSj2e?= =?us-ascii?Q?bu6fB3GlB82HNvGFnVVGWjg+MIhLR7eX4jQ53iIU2iBmHwZk3N6mpvXHtPwV?= =?us-ascii?Q?3YjdL2SbddnrgQcPi5+Nzozceyi1ebFsy/FWf07ypdVew2s7OPsEvOE8cFJN?= =?us-ascii?Q?QNzyzttEwTGg88/qPHLtjEESEnSuLKcgGzBzMkHurDbrJG7BnfOrZXw571PN?= =?us-ascii?B?UT09?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 6:e4f7P1rP6L4jxErxejcAzUztrnBt7jI3SUWh8nDQJo7kG/c1dMga/xXi5bbZAHzeaQMyTE4O2iFW4J9a8wheUKKJfUoDSvkhCaEAXr7fpVL7TE5OpjkAeWC23PpD/jEdmPn1Yt9XzP5QQX6KvlTOJk3nv/jjZOPUmXW10vZAbSE6q7KiNgrREFnBr0ehRPFnyNot/5XGvbHR/cvkcxrmTJn4tkKw73cYJZ/pSRowsmn+UzIiUCSrLoiFUIH2Ob1Rc6BI802Bmt7O7f2gtBg6L3hIFRV0t7eMOYbH2iPz5gWXGo8FTCxmreSb1zI+B9sWyOt1FX+po8CIO8HlrP1/KzzLZdJh3W21Pxg4oXODduh97i7qmgFS5itgLOOQO11gXPpaWP2SzzZJtVvVssF/f8CCjKeGmaM37RrxuWIqDD4=; 5:I77bSAFkqZajsu/VIxVlfbDHotodSoN1o5oeMbB+Fap0/I8JQjPxlkPANWmCF35zK2BIuY8XE8dCsNqbysvdRcV/i50SBybwBGw6moLWt6UpvmUXo8IFB2q6bhMV37xCCynSEkGCTZrp6TNIJ8cOeA==; 24:3UQlpC9Zt20BT3JwxEQqJyePTr+q8gcrB+NXK2FrarRqA0ehT/Ip+5ZLCjSr4fNvcs+aTuM2blLkZusWYA1Xc8kBk8WoXxQHvD6RZyNSM8M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1238; 7:CS+VCVBSCZcLBmqs5/SXMlfNmsAIlr4hZObwOo2wxDtZXDxYnikDgNqjTDkYGYvhNSS0Hz8wqYvUDJ9FxGM5lt4qaGC3dPNDa05+9jGawqCZaCAzr6pXoWQFGyN9I2SGEX1GHta5xztKt+qvhkac2dFU4Q6e0iGKnoE9FvMN0us4KKuyqt73m9r6ILs6YiiDbmF174k2LYS4T74DZ1uvR0AUM8tR0zJ04/stSglp4VMbM0CbXQywBC7F1uvevJV6DOIneybwKXLqupdSKamF4mD4vfgmXIJ591RiYphAWP/n5GJekXrBtMVIQ+q1qNrDebFThxdTPdFF9qQq+X6PCw==; 20:Gl66P70dzDBRd/0K9zfb8HzI/5D8VW/bqCFOSNor9YflIWW3Hv7XCMiBEjL0cOxJCQQ1QaKlmTu9otrCHMkblhajjoeeDUaPMM4U26CIBq6veya75iKQX/5iz1swnJr6uk6Jdo4Qws+0pCRuSE24AvYThzraHhAI4TdIdw1zq27+N8F6/LoM5H9C6hDUvKFc7I2xGhhFg16mZ+vUPbFf2k9b+Dy+8O/DW2OcfzZhpBC2NMcGdleVn9vvTa/tpI/y X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2017 17:43:21.7414 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1238 Subject: [edk2] [PATCH v4 6/6] UefiCpuPkg/PiSmmCpuDxeSmm: 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 entriees 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: Star Zeng Reviewed-by: Jeff Fan --- UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c | 6 +- UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 83 +++---------------= ---- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 14 ++++ UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 8 ++- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 2 + UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c | 14 ++-- UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c | 16 +++-- UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c | 41 ++++++----- UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c | 32 +++++---- 9 files changed, 91 insertions(+), 125 deletions(-) mode change 100644 =3D> 100755 UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c b/UefiCpuPkg/PiSmmCpu= DxeSmm/Ia32/PageTbl.c index c1f4b7e..119810a 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c @@ -2,6 +2,8 @@ Page table manipulation functions for IA-32 processors =20 Copyright (c) 2009 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -204,7 +206,7 @@ SetPageTableAttributes ( PageTableSplitted =3D (PageTableSplitted || IsSplitted); =20 for (Index3 =3D 0; Index3 < 4; Index3++) { - L2PageTable =3D (UINT64 *)(UINTN)(L3PageTable[Index3] & PAGING_4K_AD= DRESS_MASK_64); + L2PageTable =3D (UINT64 *)(UINTN)(L3PageTable[Index3] & ~mAddressEnc= Mask & PAGING_4K_ADDRESS_MASK_64); if (L2PageTable =3D=3D NULL) { continue; } @@ -217,7 +219,7 @@ SetPageTableAttributes ( // 2M continue; } - L1PageTable =3D (UINT64 *)(UINTN)(L2PageTable[Index2] & PAGING_4K_= ADDRESS_MASK_64); + L1PageTable =3D (UINT64 *)(UINTN)(L2PageTable[Index2] & ~mAddressE= ncMask & PAGING_4K_ADDRESS_MASK_64); if (L1PageTable =3D=3D NULL) { continue; } diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxe= Smm/MpService.c index c7aa48b..d99ad46 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c @@ -2,6 +2,8 @@ SMM MP service implementation =20 Copyright (c) 2009 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -781,7 +783,8 @@ Gen4GPageTable ( // Set Page Directory Pointers // for (Index =3D 0; Index < 4; Index++) { - Pte[Index] =3D (UINTN)PageTable + EFI_PAGE_SIZE * (Index + 1) + (Is32B= itPageTable ? IA32_PAE_PDPTE_ATTRIBUTE_BITS : PAGE_ATTRIBUTE_BITS); + Pte[Index] =3D (UINT64)((UINTN)PageTable + EFI_PAGE_SIZE * (Index + 1)= ) | mAddressEncMask | + (Is32BitPageTable ? IA32_PAE_PDPTE_ATTRIBUTE_BITS : PAG= E_ATTRIBUTE_BITS); } Pte +=3D EFI_PAGE_SIZE / sizeof (*Pte); =20 @@ -789,7 +792,7 @@ Gen4GPageTable ( // Fill in Page Directory Entries // for (Index =3D 0; Index < EFI_PAGE_SIZE * 4 / sizeof (*Pte); Index++) { - Pte[Index] =3D (Index << 21) | IA32_PG_PS | PAGE_ATTRIBUTE_BITS; + Pte[Index] =3D (Index << 21) | mAddressEncMask | IA32_PG_PS | PAGE_ATT= RIBUTE_BITS; } =20 if (FeaturePcdGet (PcdCpuSmmStackGuard)) { @@ -797,8 +800,8 @@ Gen4GPageTable ( GuardPage =3D mSmmStackArrayBase + EFI_PAGE_SIZE; Pdpte =3D (UINT64*)PageTable; for (PageIndex =3D Low2MBoundary; PageIndex <=3D High2MBoundary; PageI= ndex +=3D SIZE_2MB) { - Pte =3D (UINT64*)(UINTN)(Pdpte[BitFieldRead32 ((UINT32)PageIndex, 30= , 31)] & ~(EFI_PAGE_SIZE - 1)); - Pte[BitFieldRead32 ((UINT32)PageIndex, 21, 29)] =3D (UINT64)Pages | = PAGE_ATTRIBUTE_BITS; + Pte =3D (UINT64*)(UINTN)(Pdpte[BitFieldRead32 ((UINT32)PageIndex, 30= , 31)] & ~mAddressEncMask & ~(EFI_PAGE_SIZE - 1)); + Pte[BitFieldRead32 ((UINT32)PageIndex, 21, 29)] =3D (UINT64)Pages | = mAddressEncMask | PAGE_ATTRIBUTE_BITS; // // Fill in Page Table Entries // @@ -809,13 +812,13 @@ Gen4GPageTable ( // // Mark the guard page as non-present // - Pte[Index] =3D PageAddress; + Pte[Index] =3D PageAddress | mAddressEncMask; GuardPage +=3D mSmmStackSize; if (GuardPage > mSmmStackArrayEnd) { GuardPage =3D 0; } } else { - Pte[Index] =3D PageAddress | PAGE_ATTRIBUTE_BITS; + Pte[Index] =3D PageAddress | mAddressEncMask | PAGE_ATTRIBUTE_BI= TS; } PageAddress+=3D EFI_PAGE_SIZE; } @@ -827,74 +830,6 @@ Gen4GPageTable ( } =20 /** - Set memory cache ability. - - @param PageTable PageTable Address - @param Address Memory Address to change cache ability - @param Cacheability Cache ability to set - -**/ -VOID -SetCacheability ( - IN UINT64 *PageTable, - IN UINTN Address, - IN UINT8 Cacheability - ) -{ - UINTN PTIndex; - VOID *NewPageTableAddress; - UINT64 *NewPageTable; - UINTN Index; - - ASSERT ((Address & EFI_PAGE_MASK) =3D=3D 0); - - if (sizeof (UINTN) =3D=3D sizeof (UINT64)) { - PTIndex =3D (UINTN)RShiftU64 (Address, 39) & 0x1ff; - ASSERT (PageTable[PTIndex] & IA32_PG_P); - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & gPhyMask); - } - - PTIndex =3D (UINTN)RShiftU64 (Address, 30) & 0x1ff; - ASSERT (PageTable[PTIndex] & IA32_PG_P); - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & gPhyMask); - - // - // A perfect implementation should check the original cacheability with = the - // one being set, and break a 2M page entry into pieces only when they - // disagreed. - // - PTIndex =3D (UINTN)RShiftU64 (Address, 21) & 0x1ff; - if ((PageTable[PTIndex] & IA32_PG_PS) !=3D 0) { - // - // Allocate a page from SMRAM - // - NewPageTableAddress =3D AllocatePageTableMemory (1); - ASSERT (NewPageTableAddress !=3D NULL); - - NewPageTable =3D (UINT64 *)NewPageTableAddress; - - for (Index =3D 0; Index < 0x200; Index++) { - NewPageTable[Index] =3D PageTable[PTIndex]; - if ((NewPageTable[Index] & IA32_PG_PAT_2M) !=3D 0) { - NewPageTable[Index] &=3D ~((UINT64)IA32_PG_PAT_2M); - NewPageTable[Index] |=3D (UINT64)IA32_PG_PAT_4K; - } - NewPageTable[Index] |=3D (UINT64)(Index << EFI_PAGE_SHIFT); - } - - PageTable[PTIndex] =3D ((UINTN)NewPageTableAddress & gPhyMask) | PAGE_= ATTRIBUTE_BITS; - } - - ASSERT (PageTable[PTIndex] & IA32_PG_P); - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & gPhyMask); - - PTIndex =3D (UINTN)RShiftU64 (Address, 12) & 0x1ff; - ASSERT (PageTable[PTIndex] & IA32_PG_P); - PageTable[PTIndex] &=3D ~((UINT64)((IA32_PG_PAT_4K | IA32_PG_CD | IA32_P= G_WT))); - PageTable[PTIndex] |=3D (UINT64)Cacheability; -} - -/** Schedule a procedure to run on the specified CPU. =20 @param[in] Procedure The address of the procedure t= o run diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.c old mode 100644 new mode 100755 index fc7714a..d5b8900 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c @@ -2,6 +2,8 @@ Agent Module to load other modules to deploy SMM Entry Vector for X86 CPU. =20 Copyright (c) 2009 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -97,6 +99,11 @@ BOOLEAN mSmmReadyToLock =3D FALSE; BOOLEAN mSmmCodeAccessCheckEnable =3D FALSE; =20 // +// Global copy of the PcdPteMemoryEncryptionAddressOrMask +// +UINT64 mAddressEncMask =3D 0; + +// // Spin lock used to serialize setting of SMM Code Access Check feature // SPIN_LOCK *mConfigSmmCodeAccessCheckLock =3D NULL; @@ -605,6 +612,13 @@ PiCpuSmmEntry ( DEBUG ((EFI_D_INFO, "PcdCpuSmmCodeAccessCheckEnable =3D %d\n", mSmmCodeA= ccessCheckEnable)); =20 // + // Save the PcdPteMemoryEncryptionAddressOrMask value into a global vari= able. + // Make sure AddressEncMask is contained to smallest supported address f= ield. + // + mAddressEncMask =3D PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAG= ING_1G_ADDRESS_MASK_64; + DEBUG ((EFI_D_INFO, "mAddressEncMask =3D 0x%lx\n", mAddressEncMask)); + + // // If support CPU hot plug, we need to allocate resources for possibly h= ot-added processors // if (FeaturePcdGet (PcdCpuHotPlugSupport)) { diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.h index 69c54fb..71af2f1 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h @@ -2,6 +2,8 @@ Agent Module to load other modules to deploy SMM Entry Vector for X86 CPU. =20 Copyright (c) 2009 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -184,7 +186,6 @@ extern EFI_SMM_CPU_PROTOCOL mSmmCpu; /// extern UINT8 mSmmSaveStateRegisterLma; =20 - // // SMM CPU Protocol function prototypes. // @@ -415,6 +416,11 @@ extern SPIN_LOCK *mPFLock; extern SPIN_LOCK *mConfigSmmCodeAccessCheckLock; extern SPIN_LOCK *mMemoryMappedLock; =20 +// +// Copy of the PcdPteMemoryEncryptionAddressOrMask +// +extern UINT64 mAddressEncMask; + /** Create 4G PageTable in SMRAM. =20 diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf b/UefiCpuPkg/PiSm= mCpuDxeSmm/PiSmmCpuDxeSmm.inf index d409edf..099792e 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf @@ -5,6 +5,7 @@ # provides CPU specific services in SMM. # # Copyright (c) 2009 - 2016, 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 @@ -157,6 +158,7 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode ## CONS= UMES gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStaticPageTable ## CONS= UMES gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONS= UMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ##= CONSUMES =20 [Depex] gEfiMpServiceProtocolGuid diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPk= g/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c index 13323d5..a535389 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c @@ -119,7 +119,7 @@ GetPageTableEntry ( return NULL; } =20 - L3PageTable =3D (UINT64 *)(UINTN)(L4PageTable[Index4] & PAGING_4K_ADDR= ESS_MASK_64); + L3PageTable =3D (UINT64 *)(UINTN)(L4PageTable[Index4] & ~mAddressEncMa= sk & PAGING_4K_ADDRESS_MASK_64); } else { L3PageTable =3D (UINT64 *)GetPageTableBase (); } @@ -133,7 +133,7 @@ GetPageTableEntry ( return &L3PageTable[Index3]; } =20 - L2PageTable =3D (UINT64 *)(UINTN)(L3PageTable[Index3] & PAGING_4K_ADDRES= S_MASK_64); + L2PageTable =3D (UINT64 *)(UINTN)(L3PageTable[Index3] & ~mAddressEncMask= & PAGING_4K_ADDRESS_MASK_64); if (L2PageTable[Index2] =3D=3D 0) { *PageAttribute =3D PageNone; return NULL; @@ -145,7 +145,7 @@ GetPageTableEntry ( } =20 // 4k - L1PageTable =3D (UINT64 *)(UINTN)(L2PageTable[Index2] & PAGING_4K_ADDRES= S_MASK_64); + L1PageTable =3D (UINT64 *)(UINTN)(L2PageTable[Index2] & ~mAddressEncMask= & PAGING_4K_ADDRESS_MASK_64); if ((L1PageTable[Index1] =3D=3D 0) && (Address !=3D 0)) { *PageAttribute =3D PageNone; return NULL; @@ -304,9 +304,9 @@ SplitPage ( } BaseAddress =3D *PageEntry & PAGING_2M_ADDRESS_MASK_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) | mAddres= sEncMask | ((*PageEntry) & PAGE_PROGATE_BITS); } - (*PageEntry) =3D (UINT64)(UINTN)NewPageEntry + PAGE_ATTRIBUTE_BITS; + (*PageEntry) =3D (UINT64)(UINTN)NewPageEntry | mAddressEncMask | PAG= E_ATTRIBUTE_BITS; return RETURN_SUCCESS; } else { return RETURN_UNSUPPORTED; @@ -325,9 +325,9 @@ SplitPage ( } BaseAddress =3D *PageEntry & PAGING_1G_ADDRESS_MASK_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) | mAddres= sEncMask | IA32_PG_PS | ((*PageEntry) & PAGE_PROGATE_BITS); } - (*PageEntry) =3D (UINT64)(UINTN)NewPageEntry + PAGE_ATTRIBUTE_BITS; + (*PageEntry) =3D (UINT64)(UINTN)NewPageEntry | mAddressEncMask | PAG= E_ATTRIBUTE_BITS; return RETURN_SUCCESS; } else { return RETURN_UNSUPPORTED; diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpuDx= eSmm/SmmProfile.c index f53819e..1b84e2c 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c @@ -2,6 +2,8 @@ Enable SMM profile. =20 Copyright (c) 2012 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -513,7 +515,7 @@ InitPaging ( // continue; } - Pde =3D (UINT64 *)(UINTN)(Pml4[Level1] & PHYSICAL_ADDRESS_MASK); + Pde =3D (UINT64 *)(UINTN)(Pml4[Level1] & ~mAddressEncMask & PHYSICAL= _ADDRESS_MASK); } else { Pde =3D (UINT64*)(UINTN)mSmmProfileCr3; } @@ -530,7 +532,7 @@ InitPaging ( // continue; } - Pte =3D (UINT64 *)(UINTN)(*Pde & PHYSICAL_ADDRESS_MASK); + Pte =3D (UINT64 *)(UINTN)(*Pde & ~mAddressEncMask & PHYSICAL_ADDRESS= _MASK); if (Pte =3D=3D 0) { continue; } @@ -557,9 +559,9 @@ InitPaging ( =20 // Split it for (Level4 =3D 0; Level4 < SIZE_4KB / sizeof(*Pt); Level4++) { - Pt[Level4] =3D Address + ((Level4 << 12) | PAGE_ATTRIBUTE_BITS= ); + Pt[Level4] =3D Address + ((Level4 << 12) | mAddressEncMask | P= AGE_ATTRIBUTE_BITS); } // end for PT - *Pte =3D (UINTN)Pt | PAGE_ATTRIBUTE_BITS; + *Pte =3D (UINT64)(UINTN)Pt | mAddressEncMask | PAGE_ATTRIBUTE_BI= TS; } // end if IsAddressSplit } // end for PTE } // end for PDE @@ -577,7 +579,7 @@ InitPaging ( // continue; } - Pde =3D (UINT64 *)(UINTN)(Pml4[Level1] & PHYSICAL_ADDRESS_MASK); + Pde =3D (UINT64 *)(UINTN)(Pml4[Level1] & ~mAddressEncMask & PHYSICAL= _ADDRESS_MASK); } else { Pde =3D (UINT64*)(UINTN)mSmmProfileCr3; } @@ -597,7 +599,7 @@ InitPaging ( } continue; } - Pte =3D (UINT64 *)(UINTN)(*Pde & PHYSICAL_ADDRESS_MASK); + Pte =3D (UINT64 *)(UINTN)(*Pde & ~mAddressEncMask & PHYSICAL_ADDRESS= _MASK); if (Pte =3D=3D 0) { continue; } @@ -624,7 +626,7 @@ InitPaging ( } } else { // 4KB page - Pt =3D (UINT64 *)(UINTN)(*Pte & PHYSICAL_ADDRESS_MASK); + Pt =3D (UINT64 *)(UINTN)(*Pte & ~mAddressEncMask & PHYSICAL_ADDR= ESS_MASK); if (Pt =3D=3D 0) { continue; } diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/UefiCpuPkg/PiSmmCpuD= xeSmm/X64/PageTbl.c index 17b2f4c..19b19d8 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c @@ -2,6 +2,8 @@ Page Fault (#PF) handler for X64 processors =20 Copyright (c) 2009 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -16,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER= EXPRESS OR IMPLIED. =20 #define PAGE_TABLE_PAGES 8 #define ACC_MAX_BIT BIT3 + LIST_ENTRY mPagePool =3D INITIALIZE_LIST_HEAD_VAR= IABLE (mPagePool); BOOLEAN m1GPageTableSupport =3D FALSE; UINT8 mPhysicalAddressBits; @@ -168,13 +171,13 @@ SetStaticPageTable ( // // Each PML4 entry points to a page of Page Directory Pointer entries. // - PageDirectoryPointerEntry =3D (UINT64 *) ((*PageMapLevel4Entry) & gPhy= Mask); + PageDirectoryPointerEntry =3D (UINT64 *) ((*PageMapLevel4Entry) & ~mAd= dressEncMask & gPhyMask); if (PageDirectoryPointerEntry =3D=3D NULL) { PageDirectoryPointerEntry =3D AllocatePageTableMemory (1); ASSERT(PageDirectoryPointerEntry !=3D NULL); ZeroMem (PageDirectoryPointerEntry, EFI_PAGES_TO_SIZE(1)); =20 - *PageMapLevel4Entry =3D ((UINTN)PageDirectoryPointerEntry & gPhyMask= ) | PAGE_ATTRIBUTE_BITS; + *PageMapLevel4Entry =3D (UINT64)(UINTN)PageDirectoryPointerEntry | m= AddressEncMask | PAGE_ATTRIBUTE_BITS; } =20 if (m1GPageTableSupport) { @@ -189,7 +192,7 @@ SetStaticPageTable ( // // Fill in the Page Directory entries // - *PageDirectory1GEntry =3D (PageAddress & gPhyMask) | IA32_PG_PS | = PAGE_ATTRIBUTE_BITS; + *PageDirectory1GEntry =3D PageAddress | mAddressEncMask | IA32_PG_= PS | PAGE_ATTRIBUTE_BITS; } } else { PageAddress =3D BASE_4GB; @@ -204,7 +207,7 @@ SetStaticPageTable ( // Each Directory Pointer entries points to a page of Page Directo= ry entires. // So allocate space for them and fill them in in the IndexOfPageD= irectoryEntries loop. // - PageDirectoryEntry =3D (UINT64 *) ((*PageDirectoryPointerEntry) & = gPhyMask); + PageDirectoryEntry =3D (UINT64 *) ((*PageDirectoryPointerEntry) & = ~mAddressEncMask & gPhyMask); if (PageDirectoryEntry =3D=3D NULL) { PageDirectoryEntry =3D AllocatePageTableMemory (1); ASSERT(PageDirectoryEntry !=3D NULL); @@ -213,14 +216,14 @@ SetStaticPageTable ( // // Fill in a Page Directory Pointer Entries // - *PageDirectoryPointerEntry =3D (UINT64)(UINTN)PageDirectoryEntry= | PAGE_ATTRIBUTE_BITS; + *PageDirectoryPointerEntry =3D (UINT64)(UINTN)PageDirectoryEntry= | mAddressEncMask | PAGE_ATTRIBUTE_BITS; } =20 for (IndexOfPageDirectoryEntries =3D 0; IndexOfPageDirectoryEntrie= s < 512; IndexOfPageDirectoryEntries++, PageDirectoryEntry++, PageAddress += =3D SIZE_2MB) { // // Fill in the Page Directory entries // - *PageDirectoryEntry =3D (UINT64)PageAddress | IA32_PG_PS | PAGE_= ATTRIBUTE_BITS; + *PageDirectoryEntry =3D PageAddress | mAddressEncMask | IA32_PG_= PS | PAGE_ATTRIBUTE_BITS; } } } @@ -276,7 +279,7 @@ SmmInitPageTable ( // PTEntry =3D (UINT64*)AllocatePageTableMemory (1); ASSERT (PTEntry !=3D NULL); - *PTEntry =3D Pages | PAGE_ATTRIBUTE_BITS; + *PTEntry =3D Pages | mAddressEncMask | PAGE_ATTRIBUTE_BITS; ZeroMem (PTEntry + 1, EFI_PAGE_SIZE - sizeof (*PTEntry)); =20 // @@ -457,7 +460,7 @@ ReclaimPages ( // continue; } - Pdpt =3D (UINT64*)(UINTN)(Pml4[Pml4Index] & gPhyMask); + Pdpt =3D (UINT64*)(UINTN)(Pml4[Pml4Index] & ~mAddressEncMask & gPhyMas= k); PML4EIgnore =3D FALSE; for (PdptIndex =3D 0; PdptIndex < EFI_PAGE_SIZE / sizeof (*Pdpt); Pdpt= Index++) { if ((Pdpt[PdptIndex] & IA32_PG_P) =3D=3D 0 || (Pdpt[PdptIndex] & IA3= 2_PG_PMNT) !=3D 0) { @@ -478,7 +481,7 @@ ReclaimPages ( // we will not check PML4 entry more // PML4EIgnore =3D TRUE; - Pdt =3D (UINT64*)(UINTN)(Pdpt[PdptIndex] & gPhyMask); + Pdt =3D (UINT64*)(UINTN)(Pdpt[PdptIndex] & ~mAddressEncMask & gPh= yMask); PDPTEIgnore =3D FALSE; for (PdtIndex =3D 0; PdtIndex < EFI_PAGE_SIZE / sizeof(*Pdt); PdtI= ndex++) { if ((Pdt[PdtIndex] & IA32_PG_P) =3D=3D 0 || (Pdt[PdtIndex] & IA3= 2_PG_PMNT) !=3D 0) { @@ -560,7 +563,7 @@ ReclaimPages ( // // Secondly, insert the page pointed by this entry into page pool and cl= ear this entry // - InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(*ReleasePageAddress & g= PhyMask)); + InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(*ReleasePageAddress & ~= mAddressEncMask & gPhyMask)); *ReleasePageAddress =3D 0; =20 // @@ -572,14 +575,14 @@ ReclaimPages ( // // If 4 KByte Page Table is released, check the PDPT entry // - Pdpt =3D (UINT64*)(UINTN)(Pml4[MinPml4] & gPhyMask); + Pdpt =3D (UINT64*)(UINTN)(Pml4[MinPml4] & ~mAddressEncMask & gPhyMas= k); SubEntriesNum =3D GetSubEntriesNum(Pdpt + MinPdpt); if (SubEntriesNum =3D=3D 0) { // // Release the empty Page Directory table if there was no more 4 K= Byte Page Table entry // clear the Page directory entry // - InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(Pdpt[MinPdpt] & g= PhyMask)); + InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(Pdpt[MinPdpt] & ~= mAddressEncMask & gPhyMask)); Pdpt[MinPdpt] =3D 0; // // Go on checking the PML4 table @@ -603,7 +606,7 @@ ReclaimPages ( // Release the empty PML4 table if there was no more 1G KByte Page= Table entry // clear the Page directory entry // - InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(Pml4[MinPml4] & g= PhyMask)); + InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(Pml4[MinPml4] & ~= mAddressEncMask & gPhyMask)); Pml4[MinPml4] =3D 0; MinPdpt =3D (UINTN)-1; continue; @@ -747,7 +750,7 @@ SmiDefaultPFHandler ( // // If the entry is not present, allocate one page from page pool f= or it // - PageTable[PTIndex] =3D AllocPage () | PAGE_ATTRIBUTE_BITS; + PageTable[PTIndex] =3D AllocPage () | mAddressEncMask | PAGE_ATTRI= BUTE_BITS; } else { // // Save the upper entry address @@ -760,7 +763,7 @@ SmiDefaultPFHandler ( // PageTable[PTIndex] |=3D (UINT64)IA32_PG_A; SetAccNum (PageTable + PTIndex, 7); - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & gPhyMask); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMask= & gPhyMask); } =20 PTIndex =3D BitFieldRead64 (PFAddress, StartBit, StartBit + 8); @@ -776,7 +779,7 @@ SmiDefaultPFHandler ( // // Fill the new entry // - PageTable[PTIndex] =3D (PFAddress & gPhyMask & ~((1ull << EndBit) - 1)= ) | + PageTable[PTIndex] =3D ((PFAddress | mAddressEncMask) & gPhyMask & ~((= 1ull << EndBit) - 1)) | PageAttribute | IA32_PG_A | PAGE_ATTRIBUTE_BITS; if (UpperEntry !=3D NULL) { SetSubEntriesNum (UpperEntry, GetSubEntriesNum (UpperEntry) + 1); @@ -927,7 +930,7 @@ SetPageTableAttributes ( PageTableSplitted =3D (PageTableSplitted || IsSplitted); =20 for (Index4 =3D 0; Index4 < SIZE_4KB/sizeof(UINT64); Index4++) { - L3PageTable =3D (UINT64 *)(UINTN)(L4PageTable[Index4] & PAGING_4K_AD= DRESS_MASK_64); + L3PageTable =3D (UINT64 *)(UINTN)(L4PageTable[Index4] & ~mAddressEnc= Mask & PAGING_4K_ADDRESS_MASK_64); if (L3PageTable =3D=3D NULL) { continue; } @@ -940,7 +943,7 @@ SetPageTableAttributes ( // 1G continue; } - L2PageTable =3D (UINT64 *)(UINTN)(L3PageTable[Index3] & PAGING_4K_= ADDRESS_MASK_64); + L2PageTable =3D (UINT64 *)(UINTN)(L3PageTable[Index3] & ~mAddressE= ncMask & PAGING_4K_ADDRESS_MASK_64); if (L2PageTable =3D=3D NULL) { continue; } @@ -953,7 +956,7 @@ SetPageTableAttributes ( // 2M continue; } - L1PageTable =3D (UINT64 *)(UINTN)(L2PageTable[Index2] & PAGING_4= K_ADDRESS_MASK_64); + L1PageTable =3D (UINT64 *)(UINTN)(L2PageTable[Index2] & ~mAddres= sEncMask & PAGING_4K_ADDRESS_MASK_64); if (L1PageTable =3D=3D NULL) { continue; } diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c b/UefiCpuPkg/Pi= SmmCpuDxeSmm/X64/SmmProfileArch.c index cc393dc..37da5fb 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c @@ -2,6 +2,8 @@ X64 processor specific functions to enable SMM profile. =20 Copyright (c) 2012 - 2016, 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 BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -52,7 +54,7 @@ InitSmmS3Cr3 ( // PTEntry =3D (UINT64*)AllocatePageTableMemory (1); ASSERT (PTEntry !=3D NULL); - *PTEntry =3D Pages | PAGE_ATTRIBUTE_BITS; + *PTEntry =3D Pages | mAddressEncMask | PAGE_ATTRIBUTE_BITS; ZeroMem (PTEntry + 1, EFI_PAGE_SIZE - sizeof (*PTEntry)); =20 // @@ -111,14 +113,14 @@ AcquirePage ( // // Cut the previous uplink if it exists and wasn't overwritten // - if ((mPFPageUplink[mPFPageIndex] !=3D NULL) && ((*mPFPageUplink[mPFPageI= ndex] & PHYSICAL_ADDRESS_MASK) =3D=3D Address)) { + if ((mPFPageUplink[mPFPageIndex] !=3D NULL) && ((*mPFPageUplink[mPFPageI= ndex] & ~mAddressEncMask & PHYSICAL_ADDRESS_MASK) =3D=3D Address)) { *mPFPageUplink[mPFPageIndex] =3D 0; } =20 // // Link & Record the current uplink // - *Uplink =3D Address | PAGE_ATTRIBUTE_BITS; + *Uplink =3D Address | mAddressEncMask | PAGE_ATTRIBUTE_BITS; mPFPageUplink[mPFPageIndex] =3D Uplink; =20 mPFPageIndex =3D (mPFPageIndex + 1) % MAX_PF_PAGE_COUNT; @@ -168,33 +170,33 @@ RestorePageTableAbove4G ( PTIndex =3D BitFieldRead64 (PFAddress, 39, 47); if ((PageTable[PTIndex] & IA32_PG_P) !=3D 0) { // PML4E - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & PHYSICAL_ADDRESS_M= ASK); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMask &= PHYSICAL_ADDRESS_MASK); PTIndex =3D BitFieldRead64 (PFAddress, 30, 38); if ((PageTable[PTIndex] & IA32_PG_P) !=3D 0) { // PDPTE - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & PHYSICAL_ADDRESS= _MASK); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMask= & PHYSICAL_ADDRESS_MASK); PTIndex =3D BitFieldRead64 (PFAddress, 21, 29); // PD if ((PageTable[PTIndex] & IA32_PG_PS) !=3D 0) { // // 2MB page // - Address =3D (UINT64)(PageTable[PTIndex] & PHYSICAL_ADDRESS_MASK); - if ((Address & PHYSICAL_ADDRESS_MASK & ~((1ull << 21) - 1)) =3D=3D= ((PFAddress & PHYSICAL_ADDRESS_MASK & ~((1ull << 21) - 1)))) { + Address =3D (UINT64)(PageTable[PTIndex] & ~mAddressEncMask & PHYSI= CAL_ADDRESS_MASK); + if ((Address & ~((1ull << 21) - 1)) =3D=3D ((PFAddress & PHYSICAL_= ADDRESS_MASK & ~((1ull << 21) - 1)))) { Existed =3D TRUE; } } else { // // 4KB page // - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & PHYSICAL_ADDRE= SS_MASK); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMa= sk& PHYSICAL_ADDRESS_MASK); if (PageTable !=3D 0) { // // When there is a valid entry to map to 4KB page, need not crea= te a new entry to map 2MB. // PTIndex =3D BitFieldRead64 (PFAddress, 12, 20); - Address =3D (UINT64)(PageTable[PTIndex] & PHYSICAL_ADDRESS_MASK); - if ((Address & PHYSICAL_ADDRESS_MASK & ~((1ull << 12) - 1)) =3D= =3D (PFAddress & PHYSICAL_ADDRESS_MASK & ~((1ull << 12) - 1))) { + Address =3D (UINT64)(PageTable[PTIndex] & ~mAddressEncMask & PHY= SICAL_ADDRESS_MASK); + if ((Address & ~((1ull << 12) - 1)) =3D=3D (PFAddress & PHYSICAL= _ADDRESS_MASK & ~((1ull << 12) - 1))) { Existed =3D TRUE; } } @@ -227,13 +229,13 @@ RestorePageTableAbove4G ( PFAddress =3D AsmReadCr2 (); // PML4E PTIndex =3D BitFieldRead64 (PFAddress, 39, 47); - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & PHYSICAL_ADDRESS_M= ASK); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMask &= PHYSICAL_ADDRESS_MASK); // PDPTE PTIndex =3D BitFieldRead64 (PFAddress, 30, 38); - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & PHYSICAL_ADDRESS_M= ASK); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMask &= PHYSICAL_ADDRESS_MASK); // PD PTIndex =3D BitFieldRead64 (PFAddress, 21, 29); - Address =3D PageTable[PTIndex] & PHYSICAL_ADDRESS_MASK; + Address =3D PageTable[PTIndex] & ~mAddressEncMask & PHYSICAL_ADDRESS_M= ASK; // // Check if 2MB-page entry need be changed to 4KB-page entry. // @@ -241,9 +243,9 @@ RestorePageTableAbove4G ( AcquirePage (&PageTable[PTIndex]); =20 // PTE - PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & PHYSICAL_ADDRESS= _MASK); + PageTable =3D (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMask= & PHYSICAL_ADDRESS_MASK); for (Index =3D 0; Index < 512; Index++) { - PageTable[Index] =3D Address | PAGE_ATTRIBUTE_BITS; + PageTable[Index] =3D Address | mAddressEncMask | PAGE_ATTRIBUTE_BI= TS; if (!IsAddressValid (Address, &Nx)) { PageTable[Index] =3D PageTable[Index] & (INTN)(INT32)(~PAGE_ATTR= IBUTE_BITS); } --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel