From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454187323911.4422597007227; Wed, 10 May 2017 15:09:47 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D856921A0BA9D; Wed, 10 May 2017 15:09:45 -0700 (PDT) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5E56E21A0BA9A for ; Wed, 10 May 2017 15:09:42 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:40 +0000 X-Original-To: edk2-devel@lists.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=uZPVBLzHvoPeR+GUq0FamZVwnfihS2y55puijWP7ZwE=; b=X7zYL+QP/RuLwqYPqLE9HLH7Yo4SrCvAmx8H/fRdqnjdTGzuhKYo8EZ6H99oJc0HgePkZFKE1NOUecehP6dAk06dqgtFm46auN1/DnA+NxovHWuCY/Fx8sRsofFoFu/7tK2DC3cDaB6ePTHwiTydFPNO1b36Z38KaEHhW+j4vsA= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:10 -0400 Message-ID: <1494454162-9940-2-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c3b81af9-9150-497e-9835-08d497f141f3 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:nsrkU5G5+zcWIOJssN7xiW0GvDmdDBfn33Cc94iDrluPaZZ6XO1Dpv17mQ40194FEvbfZjLc5DTBWq+W/5d1dRP/y6Zp/kfXOVkpYrt30xhuzoL9OJJAN7LtdDunzpnEQ1v6J0iIXIMzZrUpVyzu0grEZZ4FsorqlrqM2NhYlYxBF4oQ5MMh4gecbeodsZHceaqMNynRpnMvM1ox9s5rQEoayVvEFiIdFec/pe9JjoiV8xFmNwzLZhx1zMRkxLM91LgS2lm6WERRENQIQRd/qvjTVUwS5VxgHUy4cauzYiwEfqJ/pQKAZKsXRIhk9PqJmWONTcrueLGtSnU3trFF4CSeSDzb25Cr7BFHaQ+qX3A=; 25:7IDjVDqxKZVWmrF2I0UAORrIFvyswdBtOryI7xJ1kimZyD5AVsY+m7goFg/+sBebLL0cpqJjuRbfBR02z3O7Nt336wRWvo2V4WisH6JuTTcqWBtB2UZl1sQCCY5/sslRw92ffC2F/OBWUSgvatw7s5h9WYok7HGui9eJ0fI2JgvRjeh8oWPnlrTUuwXEmYRvFIG7Xfu7rqA6+q1DFAGEFNKt9IhSOnYoOGf9SPplLvUwKidiDpoTKaDyTPDsmxOAXkldKFat6ykbA4mh3wX/GZ2+xfyKI0lRFkArcCVnnc0n2QFoBx598q6dcbDs1jodkz/tTKLJiVEoGvS6WwyOTqIWdSk6jP70qG7tqdg03oFURHz9fu5ErEJu9Rl+KgrnLcRvyM2eqQaHzfbFdJ3YM6TLeuDBvt1xtvhPZCJE3YrtkI4Z+VjjWRS4jbRY/wwQC1ZSjRTPTRYnpaTz5a+h1eXd61A5DbnEaEFTT4Xb9+I= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:dKT/+R/p3S262IB14s/CZDowPbd80IFH8lwF0c99pemQaiQ2rl41U7zS3p/gMaaMrKt6BO8kx2PuxwevJaequQuDn03QDlI2OAlS3UzWRRUnuCj4LcybMs4RpcnHHWfmOWe2K4HO2n8l37UxNYh6dycA7K2NqqwU7E7kelrBwwTpk+dZcUg6eZsmBWkPhyypXZDAIIup9pREUGk0axccC0Q0RaJzuBit9Vv1DrDJZHE=; 20:sRf83bzXHWip02yFpqLL7JL4xzxIhAAmsMq9EaqAp0gv7VgmtcoHAtRpu8tbEao+lU98xdalaJIsAekijr5Ybef1aiDdYZNP1Wbi12X3iUaGdimUzuXGHIAOB6vl7HN5InRdRlzbKunecmfPfduU5tx6KMiJmTFx8b3C56zluIRI8v18r+2rw1N+jP19czIHKk2GVfvOLwu0qYImhwRBM/1Gb18eDrVijaeWRJ+KmMmnaMOVGovrlcoEw9sNzYoUWovWgz3z8HkSFxif7yaxiKFGoQR/N43zrVoBnTqChcRYLhJLohDvW4dFeWePTvGjwUN8RtLqnyd9yiDoiTMHlY2hE8IHxmhM2t/V1bX3zVkmSXfmG8rWv1Zu1UvN5pXgGuNX0urh0v8VkLN/OetlRs4bjOsfnaO8dplNBzI6fZcJ+J6kjZCuWR7qluneH7sMg2sWHB9uG++0tcjD5nkBMRL9iZlKVMWapmPTMoVnirhNAf7TXQPRuO2qRh59z4lK X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:vBWukVeO9HVe/jBmmmVurJq996NEVGIVVjVlJBMfpDrsQ+q5UPrsg5FI9k2s94LSwsb1S21CLiuNFpx7fhK9BJBijmOfjuVh1FQrSLEjYYXVZAl55g0gWN4ZS8n5STr8IxAsTzdR0bRP7DYduufZBPxJoVhUmZwRnXs0/dKUDSfuJ9N2vlg8+3NogAgjfCBCVtQ+hAMZrEYFXxZe5invv0pxzZlSVuJaXioSXl7X8QdXNpuFLG2OyqTkOZ24ECMJHVZha5dFEUm4ZqBt8rEY9gYYlevHxMEAqAzVN6hwd2frg4w82QnVe4bIW7hy3Lk8N5hfYuBBEtY2192yLkYxTX4p3LeSnqdiX38ELEHKGGAbL+TKiJcGd26rJt8qzyqdriQtrjQEwI7CsJUYSEhxgFsBCs63KsXoG7YAFif7n0lUTgq2dhy/cTkwlcquNe0UroBW5sto6m8om1RZuAEVa74TLaIISxS7AKbVyRW8bMXA2ISbI61lwR9YNM5J5mArtioQMofctzYrAE1Dl5QIOBYnqI0Jbbn7TOcBTWTIHz25lX682VDvf5SpTQfUQN0RM3LNaw+bbV/6Sr9mBO5Xsm6pkyAIrtS1bOWps/DymHcbMFW3lunwZFvVIB7I4/3ZYVYiWXlPS8tvAJ5m8uftp78KzZumMlZqdJMNwfV1fNthp8m1whtL/8p4ve0VkH5fP+j6FjUni3WdiJKuCP5EocAnw8RRHp8/WV0L2JKOz6MC6GKd/HXO0WoQi0w61KHNhohSoSRYzahWJFxqoZWpKnI9fPH7XvNZeveCLF6D+f9jyZBiyPxxET8L22z0P2+s44IKra6yOdxz9SUzmKnllhYjQSP3wG91h7Bvr1cpm8vS+VV5OQO3FMmDPWlfg1xd X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(6306002)(54906002)(38730400002)(53376002)(53936002)(966004)(3846002)(6116002)(50226002)(25786009)(81166006)(575784001)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(15188155005)(305945005)(2351001)(16799955002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:xb8h3oEIb6WWlDc07pb24XbnxBpu6N+G7lv3osyZH?= =?us-ascii?Q?jcH3JrHPoIftcFQc9k3TvlzHM1R81I0ID9N6RklaNS5LHTWrybdRT7kaQW0n?= =?us-ascii?Q?a/nGKZXKXCZ0h4NrQUieSWdMJp7nOYD04EmJe7aI9DpvpHXyRSlto5DyzAWr?= =?us-ascii?Q?0GFANn8uwNzLOIkanEllcCaokEMYcH0gDB+rh4L9flvX1uT+5QtnKEqrbusX?= =?us-ascii?Q?1scE41eTDgSPVs6q5c7tujs/5icF+/dA+JZYBKiLjRR3IMOyIzNBqBtQIxfS?= =?us-ascii?Q?SjKQ5DDpouKjAJf7cnqjrD19mSpv8fYEXIC/Hl+Cyg1ckg4UrSFcinoJGfye?= =?us-ascii?Q?j4GZ+TRctDbYl2/yIbvpcjpes7EGtN6ttMEGf7ViNbKnSzW6jcpoPdjgOgSx?= =?us-ascii?Q?JUzGPXu5vrBSSB9rkq+uO6on+DSF92WwC/m5boeknMhIsB28zYPJcWBciKcO?= =?us-ascii?Q?UwYpUCo4PEyF34WGHcDJCphGETWf1rgNGWxnoawutLj/WPx/09feesSDEYBM?= =?us-ascii?Q?wFdAGzheB7YlvzE+0chxpKVbLyzQoYNJzStNQDBY/vb9YEbyijqrqQDdr7JP?= =?us-ascii?Q?l9vNT9oi4MaUO+K3NDZMvmPtBRAl+nUwoJ0EjO8wKFlbkx8m1k2YBSwGWqOv?= =?us-ascii?Q?3J7zMgfgJsXjAvTHX5AEvo3G3dlfv8Tw2k3UgDshMmMAfhL8Wm1opyPsfHiz?= =?us-ascii?Q?o/+KBGov9YW12IJDz7z6mnwJLmxio+9i4vZ0vKJlTT7XKxK39pju8+4DDafJ?= =?us-ascii?Q?Y1+mk2zRn64aVVor84o4uOcCdXYB6c/AQOtzJ9anoqbmiFsjU26bvcoUqh9/?= =?us-ascii?Q?Zaewim4PCJZfUnoZexdvDccmLd68/2aEZ06bCd4N0JNikgWm6tHZoB/GUfHM?= =?us-ascii?Q?CfR6d6AHqHMt9nxYxr9edXI8Oxo5UTd2g1/4WdCpyXc9N+eM1j/FpDAoiSvN?= =?us-ascii?Q?PGL8Ffqnvlg0PScQp9N3iB9CmjEtx3fUkSyfpM6EwxgKO/vQrP9MPKTDyHS3?= =?us-ascii?Q?PnnFNoHgjwc5Os+gDAEPq7DdNMYwO59IMPDmQWfY/OcZJQQLYbOBfHtpMpfv?= =?us-ascii?Q?T0eQC7vXntXPfv1QtF/ZDry6SEE8cUhcd1rmjsHabzQCi07oeRFTNPtObAnC?= =?us-ascii?Q?iL3HcamiciSNj8PmrQ84wsyA/BB2GNp2HETnES68aoBMSeYuFt8LQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:/K/7MaONc5FOH2WeAlMgP9h6CzEHSPG8bkH+Zvqqw8kADA2gEfdwKUIneGCGC5ooFntMgEfSRYsej+dkA3DGDMsNXVzRz+ZTpZ1G0y3H6ZMARq+Nz/FkFrENSXSjWwalzTejJ3CxCeZuw4OL9x+jhfMRexnfCXGbHmPIljxSUNTq+nX54AWijRi95FnmChKnxJZ0jt3qcplERg9jezavmx4eN6D7inD7qVroqI6F6M6VGB4IvxvwPS/+nQ/f+cKaRa3XqT2AYyR4qoBHZ/w53VGnhbxj+osZObm72Hz3e6Bm8TxlwcgMNHqN8yAoSqcW4sapv0hZcHACkW/oMmBvJ/oVkkjYCAifPS/tQ2vcLOCbYjwn5QVi2Znr1TG2g42oisk9VbdwC3H+wmZ4nNXOR+Z9WdBgJM5Qtj4yUSUwPcYZ6moXf+sCErrJGau3zD57Z5JpG6ujGnxLJt4/jCJj9sFvXCokh2i+lzRmDSSKnByhr2KxMRXMCxPis0PA8f6uMxTtRgGtjAYoQFFTr+fTmtj/DNYHfegcNazzakYDWbE=; 5:9Kaa0x8ZZmRGzeHqafYEA54ncniKxURo+NE0lR4u+ke/+7d6rFzkQ6xQvouR622F37Y/pmNLDsde0lK0+HoxjYe2msZpS4bcHkTyeOnwMQme3cLaxS9jTpPqFRKqKlFYHCfDqPHtZdPoMfhhiSPtkQ==; 24:pDcRycL7na2RX6772Qzz945zdCbaEyauJV3GWBkbRt/1T7LvnycOu7qjPzssMumihSyiiLIrTk8hoB+rS21dNA5cv/pDvRtU+vRZH4PTCaw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:naPiS5sXV/GR8zpDfHEgnJ1DX1lX3+FIZvi//59x8Ed9w7gL9Srzc1iJwnGL1V6A2y9i672mCJij12iya8PAnE/ShvzBe6lxg4+fzIEgfh/45wIg5xg4+R6lW7iJisE6sVOBw8DEk+4Fa6EHP8iefCAxycBlABgd/RI8JF3y0oFOVS61XAbjMByPY3AB2mu4bdqrEg2bX9rWZMPCvBgLhnCQS18o5rIhQgkJsj9jlgqgeMXPBow9Wxqpb93kr0DcXMTDzEpSbMcHHJxJm2XFPpwLPrRk6f1ptcNJ7Ed+LJ4r3lZQdRQNmOc9/rUlSe0wLWOZLqGw4mKCEyRiCGDBKQ==; 20:w8xH3qs2Vazm9y/+9VAsU8f571OCVASNPZtRPRvQn8G4+FZxFQ8HkzAc+hU2hNWnWep0FGCelxl1F3UriUD62tID0XdmbjhyZ9/VGrcVWHqhJ3fQU5howMS86An2GQ2Dc4tqUUqTq+8R3aEutScCjFtokTK3Rq3INsoGHc8HxVVDbTt7SyMbyE0EzvgaLbc5j0eL8SOaCTZI3iVPrufzBZknGQ6boo2MbV+fZQAOv3yNIEk6zeYLRKdOiDeabaDa X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:40.7242 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 01/13] UefiCpuPkg: Define AMD Memory Encryption specific CPUID and MSR X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, Jordan Justen , Liming Gao , leo.duran@amd.com, Laszlo Ersek , Jeff Fan Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The patch defines AMD's Memory Encryption Information CPUID leaf and SEV status MSR. The complete description for CPUID leaf is available in APM volume 2, Section 15.34. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Jeff Fan Cc: Liming Gao Cc: Leo Duran Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Jeff Fan --- UefiCpuPkg/Include/Register/Amd/Cpuid.h | 162 ++++++++++++++++++++ UefiCpuPkg/Include/Register/Amd/Fam17Msr.h | 62 ++++++++ UefiCpuPkg/Include/Register/Amd/Msr.h | 29 ++++ 3 files changed, 253 insertions(+) diff --git a/UefiCpuPkg/Include/Register/Amd/Cpuid.h b/UefiCpuPkg/Include/R= egister/Amd/Cpuid.h new file mode 100644 index 000000000000..5cd42667dc46 --- /dev/null +++ b/UefiCpuPkg/Include/Register/Amd/Cpuid.h @@ -0,0 +1,162 @@ +/** @file + CPUID leaf definitions. + + Provides defines for CPUID leaf indexes. Data structures are provided f= or + registers returned by a CPUID leaf that contain one or more bit fields. + If a register returned is a single 32-bit value, then a data structure is + not provided for that register. + + Copyright (c) 2017, Advanced Micro Devices. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + + @par Specification Reference: + AMD64 Architecture Programming Manaul volume 2, March 2017, Sections 15.= 34 + +**/ + +#ifndef __AMD_CPUID_H__ +#define __AMD_CPUID_H__ + +/** + + Memory Encryption Information + + @param EAX CPUID_MEMORY_ENCRYPTION_INFO (0x8000001F) + + @retval EAX Returns the memory encryption feature support status. + @retval EBX If memory encryption feature is present then return + the page table bit number used to enable memory encryption= support + and reducing of physical address space in bits. + @retval ECX Returns number of encrypted guest supported simultaneosuly. + @retval EDX Returns minimum SEV enabled and SEV disbled ASID.. + + Example usage + @code + UINT32 Eax; + UINT32 Ebx; + UINT32 Ecx; + UINT32 Edx; + + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, &Eax, &Ebx, &Ecx, &Edx); + @endcode +**/ + +#define CPUID_MEMORY_ENCRYPTION_INFO 0x8000001F + +/** + CPUID Memory Encryption support information EAX for CPUID leaf + #CPUID_MEMORY_ENCRYPTION_INFO. +**/ +typedef union { + /// + /// Individual bit fields + /// + struct { + /// + /// [Bit 0] Secure Memory Encryption (Sme) Support + /// + UINT32 SmeBit:1; + + /// + /// [Bit 1] Secure Encrypted Virtualization (Sev) Support + /// + UINT32 SevBit:1; + + /// + /// [Bit 2] Page flush MSR support + /// + UINT32 PageFlushMsrBit:1; + + /// + /// [Bit 3] Encrypted state support + /// + UINT32 SevEsBit:1; + + /// + /// [Bit 4:31] Reserved + /// + UINT32 ReservedBits:28; + } Bits; + /// + /// All bit fields as a 32-bit value + /// + UINT32 Uint32; +} CPUID_MEMORY_ENCRYPTION_INFO_EAX; + +/** + CPUID Memory Encryption support information EBX for CPUID leaf + #CPUID_MEMORY_ENCRYPTION_INFO. +**/ +typedef union { + /// + /// Individual bit fields + /// + struct { + /// + /// [Bit 0:5] Page table bit number used to enable memory encryption + /// + UINT32 PtePosBits:6; + + /// + /// [Bit 6:11] Reduction of system physical address space bits when me= mory encryption is enabled + /// + UINT32 ReducedPhysBits:5; + + /// + /// [Bit 12:31] Reserved + /// + UINT32 ReservedBits:21; + } Bits; + /// + /// All bit fields as a 32-bit value + /// + UINT32 Uint32; +} CPUID_MEMORY_ENCRYPTION_INFO_EBX; + +/** + CPUID Memory Encryption support information ECX for CPUID leaf + #CPUID_MEMORY_ENCRYPTION_INFO. +**/ +typedef union { + /// + /// Individual bit fields + /// + struct { + /// + /// [Bit 0:31] Number of encrypted guest supported simultaneously + /// + UINT32 NumGuests; + } Bits; + /// + /// All bit fields as a 32-bit value + /// + UINT32 Uint32; +} CPUID_MEMORY_ENCRYPTION_INFO_ECX; + +/** + CPUID Memory Encryption support information EDX for CPUID leaf + #CPUID_MEMORY_ENCRYPTION_INFO. +**/ +typedef union { + /// + /// Individual bit fields + /// + struct { + /// + /// [Bit 0:31] Minimum SEV enabled, SEV-ES disabled ASID + /// + UINT32 MinAsid; + } Bits; + /// + /// All bit fields as a 32-bit value + /// + UINT32 Uint32; +} CPUID_MEMORY_ENCRYPTION_INFO_EDX; + +#endif diff --git a/UefiCpuPkg/Include/Register/Amd/Fam17Msr.h b/UefiCpuPkg/Includ= e/Register/Amd/Fam17Msr.h new file mode 100644 index 000000000000..2c5d9738fae8 --- /dev/null +++ b/UefiCpuPkg/Include/Register/Amd/Fam17Msr.h @@ -0,0 +1,62 @@ +/** @file + MSR Definitions. + + Provides defines for Machine Specific Registers(MSR) indexes. Data struc= tures + are provided for MSRs that contain one or more bit fields. If the MSR v= alue + returned is a single 32-bit or 64-bit value, then a data structure is not + provided for that MSR. + + Copyright (c) 2017, Advanced Micro Devices. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + + @par Specification Reference: + AMD64 Architecture Programming Manaul volume 2, March 2017, Sections 15.= 34 + +**/ + +#ifndef __FAM17_MSR_H +#define __FAM17_MSR_H + +/** + Secure Encrypted Virtualization (SEV) status register + +**/ +#define MSR_SEV_STATUS 0xc0010131 + +/** + MSR information returned for #MSR_SEV_STATUS +**/ +typedef union { + /// + /// Individual bit fields + /// + struct { + /// + /// [Bit 0] Secure Encrypted Virtualization (Sev) is enabled + /// + UINT32 SevBit:1; + + /// + /// [Bit 1] Secure Encrypted Virtualization Encrypted State (SevEs) is= enabled + /// + UINT32 SevEsBit:1; + + UINT32 Reserved:30; + } Bits; + /// + /// All bit fields as a 32-bit value + /// + UINT32 Uint32; + /// + /// All bit fields as a 64-bit value + /// + UINT64 Uint64; +} MSR_SEV_STATUS_REGISTER; + +#endif diff --git a/UefiCpuPkg/Include/Register/Amd/Msr.h b/UefiCpuPkg/Include/Reg= ister/Amd/Msr.h new file mode 100644 index 000000000000..bde830feb0c5 --- /dev/null +++ b/UefiCpuPkg/Include/Register/Amd/Msr.h @@ -0,0 +1,29 @@ +/** @file + MSR Definitions. + + Provides defines for Machine Specific Registers(MSR) indexes. Data struc= tures + are provided for MSRs that contain one or more bit fields. If the MSR v= alue + returned is a single 32-bit or 64-bit value, then a data structure is not + provided for that MSR. + + Copyright (c) 2017, Advanced Micro Devices. All rights reserved.
+ This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + + @par Specification Reference: + AMD64 Architecture Programming Manaul volume 2, March 2017, Sections 15.= 34 + +**/ + +#ifndef __AMD_MSR_H__ +#define __AMD_MSR_H__ + +#include +#include + +#endif --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454189518244.24571783658973; Wed, 10 May 2017 15:09:49 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1E2AC21959D41; Wed, 10 May 2017 15:09:46 -0700 (PDT) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0612.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4a::612]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E8D3A21A0BA9D for ; Wed, 10 May 2017 15:09:43 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:41 +0000 X-Original-To: edk2-devel@lists.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=j+SU2h+JefoSSc+bS8EIzjMkqSZLAigiw9vNSdTpdKA=; b=lkmZpX+tU1FEhoDCGpQQuusLboyZKxfJUcqFspIq8d2AeHiN9d8Ga12yLAxrSHiVJuzgWv+TDN2LjbfHJd65pNcwiLvN7hdBTcJZcTAtTuxdw0l7M1oV2h3Ix5K/Du04c3WJvOhO2V/zfGqLJm3lbD6xydRZAumnudeCzhheXKw= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:11 -0400 Message-ID: <1494454162-9940-3-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37c33934-95a6-4abb-904b-08d497f1429b X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:P1xecaGq+xWadE3v9a/3t5ZAZp6Zv3tKitlbTZTzQ8IC5gMupMV3rBEYRAW4yhR3J+vcJd0N6qafb2dPDXE0l64H7sCk+Z8xVB6C/gUReVoWHAs0hArcG9pzfLdo6ERx+nYzuUXgt7qNc2h/a1l6cx7qhY7/9pEwt+Sxm9CkahAj1funNSEbnNZHDpRxdFJ6dvUk3nki4rAS4Ee3XNtq94NtyBppRv4GRxmWJm8sEInmU+Ni25AJVcVoM/s/V96ORMadM/wjqPsGH2u+c4mgUT+8E5hSg18FPhdy5tIeC+bF3uK4MHiiqCnspM+YT8OP//AVQ26XOQnZZcPxU+d9nSYykMKMEcCFGryk+mYuVkM=; 25:xSTHQaGVws6y64fxX/9WeAIMKUYUXLRlQ+xh0hBt0VjVQ14oNN85GucdvhACXlUSejjsm5xCmlfPqysFUgvjU96Ge1fMZBFjwrqdO1NQH8rQZgzz5yKhGtnd8H/Fl7B5+oGUQjE4QYObfj0O3VV8nTZhd4nC4mNwQeHKzmHETVFfZb0/tvnljBTcPFVMvcfua/MkjioAGCMziHJZ5mOdVvFR2JJhRxNMUKRt6DjGo5uK9B1+MEltW5f7JdUmARfwaFb/3/IZ5wGrfZxnL/Ib3Ut1BG5Ed5wC4ytvkSbxqNVMOMmpLSSJPo53hzf3kEwI1PdYPyXYBUIAHeB0fj6AHIWctVmxFumJeFHp4+xMVC+WdPx/UM+/EzY/bvxL2cxiYV3mroj5QUifUWGQWz2w4X//g2tQWiIB3KdotRL5SXGtxuGI4s2MX4VTuO99gn8tfKeWuQqfBvP1FbNJEZUmdPZZxjnIny9HR2WLZYbjaY8= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:JqDSgjVS1aMdrUs1UWMVsk+/4EXoJXSOCtZcxPo7S/55VYvuOwKV5llhyGej2V5e+G5s5p2KeMfFgJepYfTHMCQ3ZS4UNm1b2csAwFCuNJp5EnDz9LXEbmQj5+TJh3Oo4QtgbRsGvSh9g5Tr+5K5GmTZNLtqUdaPOfXwtsHOYIqjRzFO8ROcUYMuYDWIJM1O8szJp2i9JQ3Qj1AtcVYR3SLj3V6OrkdTEdovEIhDHIo=; 20:G7EYFxHehRGPuEp+Qu74JQJUSoQhzPFA9wuiloqGTwm/te8RMZbargfAlL0UKqsbNfSYqwjjyzgWwxgL6wE/CSXZDQOkLkgM6AaaUWhg3+fqQFT88Cm0Fa5QMTdkIQk2sn36p3d8qQMnCAdbyHNQ3A69NuWtAYMM+3UGlq/y93yaZjEwwKhPD7jTM/iufXBoiZV6vd5YNX7iW8rSu8WIESmFocju9H1RkZxbFH60prAtoBdBAdAeO7ZZTWVXScopawcfAlNFVNzFgCmJ6090KFhVPSKvT9Wk8BjPVhoF4OdJNt3fOlM4UqGukxbM6Ioc93/qCoj8JReyQHW1DT9IKbVw0uDt48uZ7Ue9R0i+CUQVVx8/90WO74WK8NY8PmbQ697aUjZB3fkTCT2EwIcUD7g40BajMia92DpCDhQwSv/x3EPVadMNIhq/xgNKaU7NjdnvPzD6NkcEVpAGx+ojySSBsYfUtYNUwy+gE/WT/t9Z1AVz+DNY0d7Ki3PFDC6X X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:vrdqieBKOTA5mRc7KzZyYeTDmiF36WhZ6cfhRHHlwHFF3S/mWbWyO7fOvyBBoqQPD1ikuQ/oVmtIfxVLcfC0VjwJNRIJRVDRt7cybd5aDfbPE8Wap/OH8hNbX3jBM1Woa7z1UHxDWjzfyZ/PctSkd9R2VuQQT1721lPjPVIjw8as6vRnNMH3vGnqoX2XQkAnLj4RgfvjYjLjonKZsh0xiN5BjiiAMSySxZn6txEcg45mYmHC1y4BCXabyEeQgBYgR46NbXCYSZWAijvfniT7/XzmVk0/5diVL1sZkcBnPnynnUSu/qn30gAFZtBdVVAp+aLyrEOXYYmjRjpKsI5UdmDvoYxc+GnNptem/mTnTA/w3mxZwaBcpGKQ0FTMV+vsMv8ak8yJ5qGgVSq6u8qwppCHsOJow/65gnUGUJs7ktx6KkG9exytdIiMcH6e2kY/l7Vk+c7SNTk6wkwbtf1/DiT45/qNj5Wr5mSqPhkbfgLcnn7N5QLmaB+DU6hoPqc8X7G8sy8Q9s/8lbHqQpvCZWZ3slKF2Jhr4mC4xrGc4cRETZJ1uRKUaQ9n8wqdLGF8jeemwbxWTSF1GEWYhi4OJJD0AAcGHe4B5hoF8D2l9wBoyCugeIzEYD0YvKgctMvvs19/NvoNitbECw8+AvqIcybcbKf3d2+pmPRMlGBpJgpySfVkwNLnNE53+gNGHBU1fTr3RmPSF3ohmVv0AItk1ImSIOu94LKmTZLEYlyuz92wTs6h0Q+z7EFWdOgdl5NDHvLbuvJbvIoJMdxe9KPKpPXUYP/LoDDXqgUTc7vvu+jOo0+S0AZ/s63sP0tT6udrk+ouX1kDnp4FHZVIj2DE78nAeNbSjLEaOt149nPbZT/YnpHKYgoqTV0SywrSlHJL X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:CznuO5zZm6UAIec0rRnLF11/7/+Ch39xLXg7u87Hj?= =?us-ascii?Q?8mxkRrcFMBv6yJC0cNWeeoVhs/Li+cLt8TcWQhW5a5fS227ETRQWgaAUA8n5?= =?us-ascii?Q?0h9/f4t6RWNFig6YUGprmdUdaN/Tlup3CAGZNZA58t+KIQyMXJZT0TC1hthN?= =?us-ascii?Q?dfW1PXpgoeM6vCTrwRct7dtcUnNaxYN09Xr7HEw8quw8t8G/S5VKtRuk7K12?= =?us-ascii?Q?diCtUX5XQW3UxzibA0Km+cUOxcue+HvB35hlfa3aOlA8+zSlEYEnijRtGRrp?= =?us-ascii?Q?MuZYbV1j9c4mL/SGSXM4I7ND/T2+olM2jA010NSrufvoFBcuxWL3Jk9GT34l?= =?us-ascii?Q?kPOkMCZu6tz3OsVpNqTJ/LVDkbdfphKJBMVWsRGG2+ZsTd/xwiTyy7IOAqxJ?= =?us-ascii?Q?OGPmhN7faavPweRdsLZ2u9U9F7UHCcNOty/6aDKvVgENataFI7lxkUWh/y5G?= =?us-ascii?Q?O+XQrvq3Wkz5GcAM4ttYUL0/SMZCoxXyqcnPS0H5oMhIUuXjJfI63N2bD6IH?= =?us-ascii?Q?T3oyABbCozFJckL4lBMqOFJ1A4qINAmkm+l7HZ4ZGLMQfg0SKxvc6Dxj/bxx?= =?us-ascii?Q?VfaHMZoTpjAfHpj+ap9kd1syApFBhmS+68GoS5ctctY0gaqpiUEdFccqbsjT?= =?us-ascii?Q?A3CDVo4SXSLoCYMv6d3eibfT/ZuZa3k3C2Shsgar5vE+GC6tqj4xBBMzxALj?= =?us-ascii?Q?KppVgZzPHSVD1+LRlCzxMcTKGjXNq6CHbxEHv7AwilvMbaY0jIC/N0ga1uu+?= =?us-ascii?Q?JU0zaJLDzRL1487Q+1azWBS4bzw4ERaoixONRyH+nPRyYcSObLdeiTr/BnWz?= =?us-ascii?Q?hRYbfjWN2+U4nm6DhbtnZpstbKTVW80wgcNhYYKxX8AYCZiqR+ltkfd9YtX4?= =?us-ascii?Q?ZDRIZW/gS2NowwYwN76gCg8nGjEyse02esuOA5tU31qBPdCdTDL7WeEO8CUf?= =?us-ascii?Q?S66ril1flLmvfgpg1e4PGGCPNWSnGzDxYL5kPuvR1I7urgRiN8/J8PsGvGvu?= =?us-ascii?Q?V1/P2eKtQEQCgU7XfGBFIkeUKaCj7749G8Z3PTO9EKCFQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:F/U+nHF0ZJjauNOenMS0Eq1QatePiFTuD0l+U+NHH2JUXlhIzMZM9qGDG+Yz098gs7EtYZIVCJ0nbvUHi/Oul/9obRTc+NQu98Hsfq1msa1RbVxGgx56/SOMJzWe5aNM20Z3DuxAergQxgbppelqUdMxE3TXJYPI4Z42A4hqCGkN/6yL7Dyee20adDj2quyF0s4pac5NXNNIk93gYgATxXlIhYcsYC7RomlvcmwJcXowuhH4vHwdwKy2q5ewwJ/U7FfGnI0VtpTiogAMCKjgQ1IlYmKMPCsmpZ2nnu4q9zvP3OewtuDIp6SqF37GbTseRw+FlY07fdhbypg9ZG+WUI+ABFsEQEfTo+HChyklSrZMvAwcNqTVkPe/+hcyFUBCAlNERRao7Ogl+QwDu5HO/miyyeF5PRxXPcvZ7n+csTZ0/Lfr8SUWnjPU0+XsWtltW08NZn5oWVfIeiqWjCEeyUqZnRd3K+qmPKn0sl8NhTjJyj8wnIwfmpNWGZ6QeX3A1upSa1TpD8Plv0oAjzzlkmrdL39U0Nm/H4wJ8TvY74U=; 5:RCN4tBzz2RP1jNwvflYY3XjjqYWBCo9MA+JMPL40jq9w1YYPu2aF+FX2xURfiwlStRpZlPwa0IKNFzqZTRMTlF/IxDJKDkGTCgQtY55Ylmr7x9ZtKmusVergk0cEUgLWmmgUMAuW5mYM4pwHIlFt4w==; 24:P17/zK1XteHVjVGBQALCmGMjSoq8Vul3MntggW2106z226K9OL9geqgVTlSwhUIJq/vfLf0X8Hfz6wuidQSEMDWhl7OpfNEW5sL1rT+iP6c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:E119gUzcTMujLop85OFC3/PK4jXWoWtAxmFxVcfDt0I5PbpyX6hElTzBp5F3kHow1I0A9RkRhoGnhiYzRzwCwwEIEKGsdDL5vCg5yjWGSqSAWJyiVjRmBctNuFX+dmZXWH6kOxGtagearH29LfVQnQB/EkXY42SHVrIrnCF5L796M50Ti+xHjepw/XLmD9/nnf/3QoCLDuY5nppH2CEmHugCwDo6oJTEN1dBxzBXfz6TT/JTYlpEme0q6vYVcOBMZa102fKOStsrXg8fwM8E8nL8oSrpnOOanzFjiOtVLZa7BM7+QUNW7LGonG91tbPpXNwIHV7s4XVJaiSIS9XguQ==; 20:Wq6/pvpF7T1JvG7bF0I67yrWOv/YhWXRphGginx9nVVBqq17bKq0Vnv44Kys7hiZaFyIj4iTc05xbwmqqm6UpnS/L72R/RZKcWdZRoGrHsAt1uYYbYKH5KTkCxUtoqCxLKUpb7joCwW/huZOgVwzYgQZNFntmZCR7IwC+g06VQVKylvA2GsC+Q3PDBVjC+vzyt4T9FkbaJDjyq8DChlIZGfQMti4tEhuAkvUgfUFqYOr6yJsmUvL2L3xmMEH0/fh X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:41.9771 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 02/13] OvmfPkg/ResetVector: Set C-bit when building initial page table X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" SEV guest VMs have the concept of private and shared memory. Private memory is encrypted with the guest-specific key, while shared memory may be encrypted with hypervisor key. Certain types of memory (namely instruction pages and guest page tables) are always treated as private memory by the hardware. The C-bit in PTE indicate whether the page is private or shared. The C-bit position for the PTE can be obtained from CPUID Fn8000_001F[EBX]. When SEV is active, the BIOS is encrypted by the Qemu launch sequence, we must set the C-bit when building the page table. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Tom Lendacky Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/ResetVector/Ia32/PageTables64.asm | 70 +++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/ResetVecto= r/Ia32/PageTables64.asm index 6201cad1f5dc..3d4b04844cdf 100644 --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm +++ b/OvmfPkg/ResetVector/Ia32/PageTables64.asm @@ -37,9 +37,60 @@ BITS 32 PAGE_READ_WRITE + \ PAGE_PRESENT) =20 +; Check if Secure Encrypted Virtualization (SEV) feature is enabled +; +; If SEV is enabled then EAX will be at least 32 +; If SEV is disabled then EAX will be zero. +; +CheckSevFeature: + ; CPUID will clobber EBX, ECX, EDX, save these registers + push ebx + push ecx + push edx + + ; Check if we have a valid (0x8000_001F) CPUID leaf + mov eax, 0x80000000 + cpuid + + ; This check should fail on Intel or Non SEV AMD CPUs and in future if + ; Intel CPUs supports this CPUID leaf then we are guranteed to have ex= act + ; same bit definition. + cmp eax, 0x8000001f + jl NoSev + + ; Check for memory encryption feature: + ; CPUID Fn8000_001F[EAX] - Bit 1 + ; + mov eax, 0x8000001f + cpuid + bt eax, 1 + jnc NoSev + + ; Check if memory encryption is enabled + ; MSR_0xC0010131 - Bit 0 (SEV enabled) + mov ecx, 0xc0010131 + rdmsr + bt eax, 0 + jnc NoSev + + ; Get pte bit position to enable memory encryption + ; CPUID Fn8000_001F[EBX] - Bits 5:0 + ; + mov eax, ebx + and eax, 0x3f + jmp SevExit + +NoSev: + xor eax, eax + +SevExit: + pop edx + pop ecx + pop ebx + OneTimeCallRet CheckSevFeature =20 ; -; Modified: EAX, ECX +; Modified: EAX, ECX, EDX ; SetCr3ForPageTables64: =20 @@ -60,18 +111,34 @@ clearPageTablesMemoryLoop: mov dword[ecx * 4 + PT_ADDR (0) - 4], eax loop clearPageTablesMemoryLoop =20 + OneTimeCall CheckSevFeature + xor edx, edx + test eax, eax + jz SevNotActive + + ; If SEV is enabled, Memory encryption bit is always above 31 + sub eax, 32 + bts edx, eax + +SevNotActive: + ; ; Top level Page Directory Pointers (1 * 512GB entry) ; mov dword[PT_ADDR (0)], PT_ADDR (0x1000) + PAGE_PDP_ATTR + mov dword[PT_ADDR (4)], edx =20 ; ; Next level Page Directory Pointers (4 * 1GB entries =3D> 4GB) ; mov dword[PT_ADDR (0x1000)], PT_ADDR (0x2000) + PAGE_PDP_ATTR + mov dword[PT_ADDR (0x1004)], edx mov dword[PT_ADDR (0x1008)], PT_ADDR (0x3000) + PAGE_PDP_ATTR + mov dword[PT_ADDR (0x100C)], edx mov dword[PT_ADDR (0x1010)], PT_ADDR (0x4000) + PAGE_PDP_ATTR + mov dword[PT_ADDR (0x1014)], edx mov dword[PT_ADDR (0x1018)], PT_ADDR (0x5000) + PAGE_PDP_ATTR + mov dword[PT_ADDR (0x101C)], edx =20 ; ; Page Table Entries (2048 * 2MB entries =3D> 4GB) @@ -83,6 +150,7 @@ pageTableEntriesLoop: shl eax, 21 add eax, PAGE_2M_PDE_ATTR mov [ecx * 8 + PT_ADDR (0x2000 - 8)], eax + mov [(ecx * 8 + PT_ADDR (0x2000 - 8)) + 4], edx loop pageTableEntriesLoop =20 ; --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454192505254.59001645471415; Wed, 10 May 2017 15:09:52 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5A22021959D40; Wed, 10 May 2017 15:09:48 -0700 (PDT) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on061d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4a::61d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F325521A0BA9D for ; Wed, 10 May 2017 15:09:44 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:42 +0000 X-Original-To: edk2-devel@lists.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=d7n+JeFWbgDHPNA6SBPtmjdxVMplBzuj5b2f7yD9JMg=; b=c4WcVaTyfqIGBvjhMl6cDvghcrL8H59xj/Lu8mCIkVJJoZdanmjA3UaDQM8clUtqK57EVi378aLSn8HoRwEvAJmR2cpnO1imjFQ5lrhW9pQ3tu6Kpl5QPn8jpWjj82y1DF1L3Cgl6X8Ngp2nYekYLb9rOTvWANo9bNAhF6T9cXs= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:12 -0400 Message-ID: <1494454162-9940-4-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6e0ff90-b23d-401a-5282-08d497f1432c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:Y4Bl2lM9I7qZftgoDPsjCYuDetQtagK9NkLpaV9LbsbIO39BpEIbpWQCf+doM4lFv2LgKRJifxvrp6IKthjan/S2gaOMW9D7EHbkecjzi2M2hfRNLy5n7hI8Ib47LF3P/y+t2S4eEfOWuwoIoco1r7jMtw15c/YWM5SPsmAs2zeCf/u9jcAixr0CUAVhKTgAZJ11RQoBm20eeiAiTHeKnPSxubRt66AoUHhPYYAxY0DxTVRaVGLYcivlV0NOnHkGmvozZYvaqTP3uPmrj/nuLXoin6IC0jpZWKzgODVsG+YlEPRhU2O7B1HpUS7DST5Yqcbak7+HvqJ3jNhuPQyz2Vu/UufQJ9ZaJVT49rxOyjE=; 25:ilOknhr4PcIDYq0lf/WUIRG4LMhpoPCJqk/g7ksJcxYC/uUbUyJyKHKFaSqUJp+/Z9itRrIa31xTQmPCEmrle/GZeUUlwIi3Kw8Zd2JZ2HTIqWH2M95GqIANooEJy0p6/FS7yclaCpTUbrRK+7/YVE0aig3nC+VbCM5QEPHniRyYv4Nfw9dBMWmEb9XPgAVwwGoC3YB224Zo+Y+U5h2ck1WRnTqU1gRyfLk9/PrmBGUXBf/UJkdk1bK7IJA+PrVVI0ZJH2/Fa1W3CcUILgcWQz1DTO/YincPyyl+muS9owVunErX8D6v3dXUUsNA1wgmLkoCGGh+JTQQ4ENHzPkjaF6ixSh8aUEL41iiSJLJNx6yO5pfufR7qaWxZZkTJ2/PzXGBkpidDq+ltBXDf9ZlTHyLsX9CliJ4HL8GsfDsRHow823iG/TsT6pLHjGiE18DJa7D6zd/7kHCL9iglqpkomJVlNzHT+yS98pf6EBvoxE= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:7qWHuzuleMKgW/FixkgN6QrYWKZP3ZKcOoVc36is4UFloFkcVCEngeSWmJhKSbKa54djuiRMT8duJQKmq6Fyl7W/wUShOWmjeHlR2RvLxnj0YAYik16h846HJsjf9XaYhFfHPA0/24s+oNfSQOO5lARd4ZBmvq+1d7wqmCa/7JpN5K+SQ2uRajEJQWZhMuRWAtjcpRUhbkLN2/Yi8q+Rxaq1/xe0pQgJD/Wt1yW3Zmo=; 20:e9vpZzW0twXrKVuPP5YVxjNj5qH9ZQbfR4bfp/TpeqQCsrzlXEmILKbXRi3F14kaR/gOfbC+7ezVWXxhq5QvfLXrvjQ8S3OszSxKML9c/QPGaP5HwzeF9mGpjlSiWdZ+BbTCdmbkEHTzu/6QG6ehOz7WX0mXglc/j5UjZ6uFN1kApMBcAzJzUPktWxaBGxY9K77C6PF0PN8jf7mlSkDy3i46bGbGA7kMTJ3rqNz2aYfAz1nw/N++vmmBn2Yn43gprmO2Bq4FN8Y5Hjl+3O5ztFa5NOCbmsFO4YQ3bBuLoFbubd51jladVWiD8Cfzr/zrz8mx5HeXWG9JlzV75QHMkMdUxEGvA//l81T6NGfpvOwtxA8ZWgsYt23wBxhxDF4l4+iBLfBuZCKCWP3PyobCZpONiDx4yh0e/EuS/a8E0gN045A2eVc2FmGtJwgVeFAHSC9LXkmwirMx+nJS7Dc5Z8E/hBzu99uCGasRpul5Tkzzo6z9+VBvOJHnYo8xSZ1V X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:OR7bWWgRgwfKG8a3G5GSIqbWK+dX2BnQ8apiWk82jy7i7lvEb+jx7jqy0g84fTx2SH/RSHxKDElxvxVaMazPATGbpUpyAv77hUd9IlWUpRVkIgg6Z0BxJHGCoWkVbsyH5XbtN56mlYalXBRnZuOEP4i768eOVPiSkr/hldVGncW3V7F1QG45WGVct40tLF2kegZ3J5CF4dSnKxjp5Gy5FMOJnFS3w2COl/lNPOfAIKpxyyVaWMZ7DcGvUK2UMKgxI9HILBOi6Jvans1U+kGtaFkoKfKRo+F+JqqP901fV/h7quu38hVphPSiz+wuSp4pmvI+8DGXMac/lS1ZVUDIrqbIEYlK36+YFG/M6wLFiGusmsJrodWV1riq0vQT15zNFvXQpAdbqnzuj/kCJrNNWOBUa2vkIL5L/qxV5dF9RqesS0arnafWg2FBiMZXo/+aD2JQZK1F6gZkCSh3crHEg3d9W5bmhuzumslwZ2WohH1DMJM4P4fZsQ/UC7aCNja4jbgwhN0NHFD6QbAR2f8bJIv1aznY6pTQjhmDJEFyhVSaa3Dl2qPH41WQQ/PjA4wClIy8164yJdn2BWPErxa4egIZXWF2ToZC3gWhBCl5Ba4GiZuC7LAASqBjDwHCYwDb0I+Jg1L8H/PAduS/bFIBXZp2ZaegIHNnAVoLzHy4h0hX3GqJCzVyrXSuuBzKRGkux+WvVyuFjJuMOk/ggyPitlE1Ij9sjIxXi1PYgmLUmP2KU4oi9Xw+X8AWyNVqbjctrQlT+Evo1aIWIq4Pz2mfYuNxGXWNAVW4nOeci/+cZ7Mqgv0Zogmncztnk4e10Vycz3OOGJcEVD99pZ6/9RKYRqFbGWNQ1UiiwcdfLzxS27CKPY6IW94zeWxGT1JEBBN0 X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(15650500001)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:QP968y9Na1qNDn2uCDju3+PyBIjtgVRcahx4ScJ8T?= =?us-ascii?Q?DAgzv2WHbNsmKBClYYIe6yY6ECGRzGWTBrQWknh5uttkzqUMMz2ZiYoqKm1M?= =?us-ascii?Q?YlZQzIOQb4CgWkLkAlIjTMGGXJzWqfHQcnaq3SiGbDrxB1qQMj6acTILxaYp?= =?us-ascii?Q?q2HkbJBdVM1NfeRX2tiqG1nA5O8p1JtCvIqKxzICguSn47tTExK6XQaW2lBf?= =?us-ascii?Q?yLl24UlUyJjMVpROpAaIDiWX8VcBKzgxUzIcFXoD0Xqg2JR719Z+fLV8VXB+?= =?us-ascii?Q?3jshlavGGwk073t81GyAdl9EWWHuUWToggc7Pfbd/WzU0QDN7bpUAuN9doJd?= =?us-ascii?Q?ztiHHr1mq04Sffws8Q7BdtlmOneS+bwHaz7CHxgGjBSYC2OC8kmrdK/TAdO+?= =?us-ascii?Q?bCIhAQjdJv0itrqaGap7gnNL+FbpXSo2PToDIrslC4APIcqe8QquVPuxvBgh?= =?us-ascii?Q?tyz8MgQXjWG45ErYeZt4ADDyQiOYIz1/moaAnaqJArD+Tic2MWjgs8IRAJLe?= =?us-ascii?Q?AxC6z0E6rSqm5u77y+jPdrJHHoE0mtSHQaCpelLZdqnPx/30R3kYIOvZA6zj?= =?us-ascii?Q?a92iTth/2hXxLLcob6I7V3xIa4vpbXE1r9G9zF5/vL9bgmeADOE81wIPxHNc?= =?us-ascii?Q?C2sqw4G0SU7280/6TwLx3i4SJvU8zXKJyhpAq0Gqilhfjkw0iWaoQUbHNtgy?= =?us-ascii?Q?u1j9+qE79Doj6bcL03VRxApC9lRR7R2Amdt+wXwJY04nQvuEodyiOCXlee1d?= =?us-ascii?Q?vM/tubNXfuds0F2i7PJWcha+HfWOtcDQioOuUyI99+fjFQ376xTxgeiV/p6O?= =?us-ascii?Q?Gb20pKOeVomsVZVss2JsWSUw16uSx7UVso0VzRtW6vu3EwohuaAjbHANQv9O?= =?us-ascii?Q?fbNcMsiFztTPlbGquUCvv3vhq3KT5cq/vxjEh4FePr464+t6nnDg5L6cQAD1?= =?us-ascii?Q?XW6/u8lAevs82HvWHbY6E/BBjBozHOrOMbHGSS9xo7rwNf3HSWHtttEa9Vj3?= =?us-ascii?Q?ynL2t+TfZ9coYwaDghBy0A2EqrzYW8BMFR2H3jJkBhJBUKOSFunAEfGvZ5YB?= =?us-ascii?Q?WoJjarrwiK4UHxCkIM16weh9SqY?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:JxnfOfO/crA9Srh4z2JQpUZxqyKOLSKD4DVuNAK0ewNjxN0kQKbyF6s9ThtUvu4rdJT5P3CpY2PMNtdkIbns4Tfyb363bCV76sF42ewKlxSRaDfN+GJ2moMeb7v5soAqCzJJhnp2ZO1kXw9WddpAqzZzdhZeR8lZ7hP6I3jpLTjIt0Yb6B4sAnqYRAYO1rnZGfwRrNkPpR6DA+gqNKESPvHGonMi/dnBAFXiYrxLiOQtmUY6ijj0Q/Aw4VqzUq4spkqD1Z457g4dKMm5hGYh46NrYFDe6pBAYwR/bm8+IZrIUoSJTBRvSaIGqo2IiJIVI7dayk4i17DpX/mPgf3zyL6Z6QXJZiQdi0tSfa954NBT60NSH2es4Pi9+9KjSnNBhroyYl1VMvwc0dIjP/+8Y21WulvBJUXwcyat2bKHTL1rNb2XxGBjP0wnq8Nspy/hRjZ2aH9zWAn97VXX9tE6JPphH860q4G2fhTCOZeBoRMvKG1z+9f8BNqTpoj+s93ehhJSnPfzp3jqLwPtYx8n7J/m+Oj1LH4AaJVaiH4cc6w=; 5:8iPqK+Um8e0ZbuUyskAUS7YWxcc/TdaWD44kao7syvwiR0fcNqzrvPE+mkLFivDq+nkPNAaynArd9U3DxMbt+PVdUOai1WJsueEpxlNly8mzlgR4D+AtOEc+RHz0H4IxFabwB8r9qUROpj+cZQ5LpQ==; 24:z/7scyBdHDKNvRTKPpzE6mv45GvocSyBjU1fTJJ6Aj5KO0hBlZamOeoy2fBh7N2Nwn1tEQe2XUPnugqvslFlq+N4DW3I+RHPfjL1Fh/2MNk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:PW0hcJHyIjVAJZ9dgGg/gQy5ydP2fR6nmhO2H7TuqQjU8NvL/1IEwCAXwfOzbqFAJUCZ09O120/hSNKH0sdEkrPjSHjvIMTIdBe5TXg3lSUy2u8h6ENNf+SaKKGtWhMOpZf/8Ylo9uj1trL7cJ4a88iYNm0H1duX6BplVbEX5VX4CYhjUPu6AEfdC+IlyfE53slxjQ0hC1xIG6A5L8TRLuX1npqh+CFbwUuhbMouau1lffqh9Dx7M225UB2Z6/HvB9Wbr1aqYyHSg0UbEwjnugFgcajHmzOLJ2gTpGWWHvrgDfkPHuKzfHBD/VxDwR/mNbQ5AaFXluziL3a/Sjebag==; 20:8H6pumGnlKAer8I6G8VrbILf4IoZVJUm3eYPR/VW7Gx1cEDDwdeGp5/uoRmnFgdWCMnLPMlKHY7nyLBlyV8DCipsr3rzx8wYCNvLgb65vO460Shf0BE/aY5oJvM8lQ/8eHB+Flap5uL/xuMUEkR+JTTvc7WVOtEvRx2Dm0WbyPPbSe+4HAUOHS4+JDikR49Cq74X8e10+q4P1RlV8qVultG/opmNw2At5vkOWS7xtj1fhd/JP1VHwSlCEsdJkH9H X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:42.9268 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 03/13] OvmfPkg: Update dsc to use IoLib from BaseIoLibIntrinsicSev.inf X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When SEV is enabled then we must unroll the rep String I/O instructions. The patch updates dsc file to use SEV version of IoLib inf. The main difference between BaseIoLibIntrinsic.inf and BaseIoLibIntrinsicSev.inf is, SEV version checks if its running under SEV enabled guest, If so then it unroll the String I/O (REP INS/OUTS) otherwise fallbacks to rep ins/outs. Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 2 +- OvmfPkg/OvmfPkgIa32X64.dsc | 2 +- OvmfPkg/OvmfPkgX64.dsc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index e0779ddaa426..6494ac5480b3 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -120,7 +120,7 @@ [LibraryClasses] PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf + IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index bbe26e2cf452..20eb409a8d01 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -125,7 +125,7 @@ [LibraryClasses] PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf + IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index ff795815f65f..2e5eaf631e9f 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -125,7 +125,7 @@ [LibraryClasses] PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf + IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454195355691.2236806822693; Wed, 10 May 2017 15:09:55 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 95DD221A16E20; Wed, 10 May 2017 15:09:48 -0700 (PDT) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0613.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::613]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0C85021959D43 for ; Wed, 10 May 2017 15:09:47 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:43 +0000 X-Original-To: edk2-devel@lists.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=srSJ3M4E9wbGe+CkEmWY8fV1bPqPOF5zHyfka1eeUMY=; b=MxWWHk3bfqgbeTVWudrYxbe9p+McwTi8TBFisp8ToA6Bhm47dc7mk0b8dYw5w/mFvaWbcne392EVp0afyPIE/JKY2NOrKV6A7VmfHPxuGAw2FXZwn4+N0mPZmjt9VBKu3wEOH/KXqjveJ9P0gd2KA8HNndE2XLTZIhR8vzxK3t8= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:13 -0400 Message-ID: <1494454162-9940-5-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6f27c12c-ea4d-492c-e8d0-08d497f143fc X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:JlEG/V8s+NhjnlXqC006GhqIruDRGvG2B0Mn+Mdg3JZ9/8GbwajoQ1VsWBiMvKnYOHTxdU7MgifeNh9m5fSn969RZQ48njMzXEOvBokwSi+5NWthPo3EKjKA2NdNeQye/LsS8Xto+6Jd14cbQicSfyWOjrgT9hQezThwyLxThD5Ky0wlD1KpRibM4vMH+0e/PyVUDB5q1n8D9vJfKyY7+J72ALyei+EtrIUGuj9YxObESSowapZ3T3JP8U+Jn8DPSsYF0jHvI7xqUf04E80ZphU5ql19Ukokg7lY7CbOBatwGV2CPQWZ8R5Pd4fN4bZvpak2cKXuGwLcHJfyXr8NwvhEw9WVRCqqzxYeBEawcQU=; 25:FRGym4M/INo+D8a5sQpH/cTEp6k0YK408hKgxChVjcmqR16MzFazRLRgvMbbDfyG/2w/CZWEhC3k5vgFNs1brzjMQftmWUfya/qye3f/IWsDBjeHKTKQYFgIHft7rEsIEkUw16Om0YRxzYyXMqB3rOIh/JZyqNDVNi2Kn+siLkDsIQcliwlw5QON8fSSR8HxXnqOfcm0gnoXD/UTZtcQfyToNDJ9QGQelwQSMTK56G3/9s0Cydh90duD6cvhPbLmCNJsU73crdQReLx119a/SA6riQZmkJJLHHqV/MVHNlh2vMxi63Z97rrdCuLV2ZHsrxcQg++YpHpryX6gfDjehYCTpchc6u4vw62CKFUbMYSJFaCsl3K98gp9a0c+KByjl8vlGZcmg8G3hqvUPYpUYg0QPmCC3EyqSi5ITIg3lg7wj7Q8wlYnY/ACqDdnDPnEU6htEDmlrCtdx4teFiJbvxEMn+GL3upjMpAE3vfeA0k= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:4twlqsB0AGML3zVcy6QYO10ofD6LHCirp0MHxPE1zHNc6LMQY1ThPXCVgTr9RNT3uPHQFQkSyI4duCu1ikYRvBxdK3/wGqHMhM54wxeA8bWiUyE8yaBG0uRTXxnOg7ti/l0smTnWruRgn3Hwnd9zT1blO+aF7zmZbwBYISWIfwB3PLUuJjWv63cCr3pwrsRwLxssIkqXkNpcCFFP8q4F1lgbMlZmMgpzkYz6OCDadinUl8v8mlNMdW6vF/I4Re9IaEoRIcaj8KCWFaqHCGo8mA==; 20:0Of1h6n/xoePPZ8ZN1pSEikPwzEL+jxfKWq4IbPvaDMO3/wLXqBI/hUJwe/qyGnsurBf4OqRh7ZNCvocRr5mZMErB2G8Fd/p15M9HXMtds/o2rtBL6K3f0qUroWVGBu8dDvux3oAWyhHvTtTzP1AKYtK/1fi6MI7Gjtt9qV7Z4RZur8V+jJhdvRMEDzZJg7+ZYi+Y9ihMUpygzLGNWbXaOToh1wh5paWxU/Ze/z/fPL+FAmMj7Nkr7iDbMfH5pkmrm2BTXTRLDw9KTl6jFtfR9Tn16aG0P5tGAhkaWCBsY8pkoxmTQvsD5qGGN9GgkvRxcAlS+xbWvEWSSr7CK5g0/2cPoqfeRXa175K1d0kRxV5pH3b3OHcPo15puGF+e14CgnZSK7bZTtCG//CJUDTt/LLnSKHA+txouBFKsQ0RSC/rU+wkXKfOjrRkzaJud4z78NxADRhy6wamNcvgxP6zwNmBPvZpArJte2TrtsI7s3dDQnuKyfG6iYE31C3YjK4 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:IKMrnN7vRYq5MKykAnWeYouVNNyXoLlwcUHcN83obp3Qvyr+F5N0plCMTNCZcNajrcnd4C4g0EY9taHzzYeapxooGw+YMVWN7dYTy+RXei872vdQy0VZ4gpWQQcl4dTZRlOuajQ7jGJJt48bdPhjhcwpfgmtudqhICJ4yJdtCJEnnwT3B37hp6Xte9gmE2KsvAlo5r1gzvIN+9dVVT5LMizgIzTRfYaevsciohVip/smgqZiUjM9ataeodE5aVE5v66uVGEgbhzRWi1io5OPzfzjyUYHCUsGuuTjk+vPsqaD6SjLL3J0PbJAafpPmGiJ6YD3BVfAF9QpRz/6b8FrUe6oiMxCrfojxsbmYKHChM95O2WYQnpwoWhvefAxR/pQ95sGu7XXz/A7U6sGv8Ri4xp0lfSSit/FLLpCdZ7yowovMPiM45m9KwdPxy8LpX1sHLtfRb5+FqAdC7e6/fWDvDGjfUZEp1uf4PnT9pOQEnqjNmRPdWgXBq+GOr039ZrJ7cYkDzzNFKLX5yh/I03kSYSHqvy6dw0j8bq4pPY2kEUiBDCJqnp03HCQj++jAabjc/vP2cvMMWwkAeIx1/+pn0+o+G2ac5YShUxHOKoPeYo7RI68QyG7RnxeNmN6GFU8p4eDjr8+ow2f1B0pgWVGjYk7TNrWcS5i8l9ANtySIQaipldhaaRUETpD0aZlEJIurPCGwLIwUG6Hrmi2jIXLQoMSnPuDuiIw2MARWCoUXnoeh0dZQQD+Foqlhc4hdyI/73lePESo0EkhcJ0u33HV1X7gpMjHNZc942f/NVs7LA668KLetuyI8fjisNaFrznUJKmpdejq7GWetk28xLUUlQ1k5AjHSi5oXVwmyrLctwwULQA77mCLHXgq+CvHCqNP X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(6306002)(54906002)(38730400002)(53376002)(53946003)(53936002)(966004)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(15188155005)(305945005)(2351001)(16799955002)(579004)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:TtTMHncICcrjS41eZKJ+WrCO6oPMV5bO7GioMUwcj?= =?us-ascii?Q?LWpFmYg9xYqc0T/sJUgEMo1SIhF6BCWvPE5b7NgN9m7kSxv2AwoEdxSCq8tp?= =?us-ascii?Q?y0iFIrD6JCwivUlQeoJnfYg63rN8hUMokQOyi1MQDRTwwZoL4+Ci0/rDBUz0?= =?us-ascii?Q?fQPz6PDBlUkGsRO+hfPc2cNHwIwngeMUXASZktJcWe2FUWz42Txg6QkKIn3S?= =?us-ascii?Q?/oKgOdOEt8I6NqfU+vJscLvkXz5UbGqJk9dxckKNmJqnsoayxuEdJiTQ4yCs?= =?us-ascii?Q?OId2nlgZxf1qVSXpveG7vAf6DO+e7ZBttSMpsFF1VTamzoZegyAFhE89cnP6?= =?us-ascii?Q?JMEHnA8ZzChoJWtNadaUluw0tp09AeXZH0D317ybsfPIdTX9QVXh7OJYQe9G?= =?us-ascii?Q?l5psKwZfYq4jUCBn1VvAA1+JEROgaDjAP0+ct12LYIn9iv1U6uYKsr14Kl0K?= =?us-ascii?Q?9mUjLX4dDCm97E8fBTqswGvg8YQ9wRb6nz59G9mtAaTckxIeE0q/DbPrZbG6?= =?us-ascii?Q?Rv84LUgpLRwAZhjAtRcclrnDfuuYndaLeEoxOperR96joo3JpVljtDGpPJKD?= =?us-ascii?Q?wQRjx0LHSwtWgtPAaKLO3YP72/qUJthyiyOKWfwhNLRXkA+Q+YtOWX7tw12r?= =?us-ascii?Q?+17KbBraVfOBsDCziKYNXw0K/wgO13FMwtAYGJ+qDE9MsiwZE00V4iLXQMAw?= =?us-ascii?Q?p6c1/sh7K+EVDxyCQz1KVXACqseBJUyQVy4UbFF2ujtsAs/9TPXbJlSzU2AH?= =?us-ascii?Q?sk/902a9OscWY8nsFLwvGWV0rRNh1ez2IzCOdMi1bRvs+TErn8CNUTnfv7t+?= =?us-ascii?Q?9fUXpqYZ7507jo7T34civjMpmdhQef3sWu3NMmgv6GMgVzA9bJY/gFuuHKC7?= =?us-ascii?Q?03hWbJYHMshqsjcHADPBL75bScv8M/m9CJclya3fcQDE+EB7xT+2SnSyvUr2?= =?us-ascii?Q?L/eDF0alHpD909APqRVPFmcVjZJM6xxFTORvadZa/FT7CSnFYXMY3wfl4UNB?= =?us-ascii?Q?1gPQSdFgXULPIBGkTq7y36DG1kf5dWf36qa+M5CcNEvuw4FowXbTyEkYs+rO?= =?us-ascii?Q?BCVp5+AmJvI52yYw0NH+iDQc5jwHbi76Bbgi0oiVs5qRuHIOFLMQNcxzfQYf?= =?us-ascii?Q?z71lAccQpuQwgAWIc/1sJYMa5/x2a5SOzw9GfYLaCFOlYWMgdfvU/PlElB7k?= =?us-ascii?Q?I5NfdDs0egMcbI=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:8FDrHd1sETy8GRvMBsKgBrsVN4CO+bwlRetEZ3j71PzuMAIbhaifTnrQt+HE0hgroij4CtMN+Qy3d30+oK9ULYsoxGWiTgI2zyTAZjDUj9w4gMpA+1C9bfCggxH3tG6tUxX0ooeDHLSbsNsouU8oJWczM4DvMgxyPzLJHb1NTIONl+wndlgevylnmHFzNU3gVFhnuE8gZiSoRTUehpGJhW0KGv+pIbSp4TBzv11INwP1KCzUMJT/Bik+U1cC4m5iIXsDfw1z1AdVkGmD3HYHylGbBeKQbfTubOC8E+qDVPoWVkid0xGAvVwWRSmUIWjG4zzvoYVsz/ztD1yPuLE55CM0j2e8bzeu+BpbcY8YIrFbNVT7vF8SeW7gwbr9/fO6cNH43TzeOa69RezZ3YVFybEhf8tTk+eq7hnbsHoZm4jv7VAV8VurdnbOcWemaggL13U0MdGp0kmyTI1A+xZSdXohmBqZ2Cv47tUmuSRi0AT1XK0gAOksAMyWhfMDc3Oe0szxgrm1siXVzwEkQ4c7T+VFL17JM1z5UgK6r4OgTSg=; 5:KR0qSmjDz9VjRmVfZtLFtYt0slkiMVZs1mj2ea3bOw3Q7s01GqII8amU/T5brL0CkM5FunjImT5kvGmaBEhxTwV7zqk8BFOh9xOJ8tblwCX84FLtEXfsUFIJUtfseAW7CFIvJQHYO27KG33ugc331A==; 24:X0NXmZOGQ3VDdrwj7T8ZF3vyG1APZQ0JA2WQPoOELPcamQ/zr9dAERK8oiBHTXEOHCMlJ5AFeIHifuKnjMbXXRfKS7vNyVTzPJ3q7rtQCLc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:unDjS1nZkv+Efk81xccgjvpsu7HoYSDY5ubruMPENhP/piDtHTbsGs7QcyLZVM4gfgHBbfqD3dvHDpoNNvGvqVPXsGhchwkMU4QnRTl8q5vqhGbga00gEiPAuAj5+xuNUUa1PvOHz1Qg/CC6DYAdE26C/LvqjgKaTBDLpYu/nAiojiVhIymBXBMcNE2LuIqiScZOfUCva+MCrfqQVZ+XuCJsg/cxjsGXb9yv7cmVAr3kuyK2erPPhyzYe8ZpagGOG/YPDaSippMYNLsakTScNWi2fkKX83lU2/9SdhkrXBCtjlOJFrs8eGGzKB3xr92sV1TA7oYKHWoliPniR7Ucog==; 20:8RldSqFzjcAqPDQYEaFcqzWz3nS/HIuIzSTUsgbv+wR0JgPF9aLbCs80/vHgWAphF+v4KHbIu4U8pweML1a8XKlPuHxGJheksVgm6CbNlLP/7/WNdnXPtEX6t679YLqz7pvt1d8o66c+sdZmCBz8wiYbxyP7UwDYfTCT33TiL1VzU2E6Plvgv69exr5qS3J7P+rt6uHsHxt3f3fPOmjTL/Fn8DDvf6hLF4+O5pFSJX20X6G0HzGP1f5jrnunHwRw X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:43.8925 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 04/13] OvmfPkg/BaseMemcryptSevLib: Add SEV helper library X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add Secure Encrypted Virtualization (SEV) helper library. The library provides the routines to: - set or clear memory encryption bit for a given memory region. - query whether SEV is enabled. Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf | 50 +++ OvmfPkg/Include/Library/MemEncryptSevLib.h | 81 ++++ OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.h | 34 ++ OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h | 184 ++++= +++++ OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c | 126 ++++= ++ OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c | 43 ++ OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c | 127 ++++= ++ OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c | 422 ++++= ++++++++++++++++ 11 files changed, 1070 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 6494ac5480b3..265f2d2b6d2f 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -143,6 +143,7 @@ [LibraryClasses] QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf !if $(SMM_REQUIRE) =3D=3D FALSE LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf !endif diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 20eb409a8d01..3b50a2dd2d2f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -148,6 +148,7 @@ [LibraryClasses] QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf !if $(SMM_REQUIRE) =3D=3D FALSE LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf !endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 2e5eaf631e9f..82c73331aa9f 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -148,6 +148,7 @@ [LibraryClasses] QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf + MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf !if $(SMM_REQUIRE) =3D=3D FALSE LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf !endif diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf = b/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf new file mode 100644 index 000000000000..949c430af61b --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf @@ -0,0 +1,50 @@ +## @file +# Library provides the helper functions for SEV guest +# +# Copyright (c) 2017 Advanced Micro Devices. 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 licen= se +# may be found at http://opensource.org/licenses/bsd-license.php +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IM= PLIED. +# +# +## + +[Defines] + INF_VERSION =3D 1.25 + BASE_NAME =3D MemEncryptSevLib + FILE_GUID =3D c1594631-3888-4be4-949f-9c630dbc842b + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D MemEncryptSevLib|PEIM DXE_DRIVER DXE_= RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_DRIVER + +# +# The following information is for reference only and not required by the = build tools. +# +# VALID_ARCHITECTURES =3D IA32 X64 +# + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + OvmfPkg/OvmfPkg.dec + UefiCpuPkg/UefiCpuPkg.dec + +[Sources.X64] + X64/MemEncryptSevLib.c + X64/VirtualMemory.c + MemEncryptSevLibInternal.c + +[Sources.IA32] + Ia32/MemEncryptSevLib.c + MemEncryptSevLibInternal.c + +[LibraryClasses] + BaseLib + CpuLib + CacheMaintenanceLib + DebugLib + MemoryAllocationLib diff --git a/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/L= ibrary/MemEncryptSevLib.h new file mode 100644 index 000000000000..b6753762423e --- /dev/null +++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h @@ -0,0 +1,81 @@ +/** @file + + Define Secure Encrypted Virtualization (SEV) base library helper function + + 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 which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#ifndef _MEM_ENCRYPT_SEV_LIB_H_ +#define _MEM_ENCRYPT_SEV_LIB_H_ + +#include + +/** + Returns a boolean to indicate whether SEV is enabled + + @retval TRUE SEV is active + @retval FALSE SEV is not enabled + **/ +BOOLEAN +EFIAPI +MemEncryptSevIsEnabled ( + VOID + ); + +/** + This function clears memory encryption bit for the memory region specifi= ed + by BaseAddress and Number of pages from the current page table context. + + @param[in] BaseAddress The physical address that is the start= address + of a memory region. + @param[in] NumberOfPages The number of pages from start memory = region. + @param[in] Flush Flush the caches before clearing the b= it + (mostly TRUE except MMIO addresses) + + @retval RETURN_SUCCESS The attributes were cleared for the me= mory region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing memory encryption attribute i= s not + supported + **/ +RETURN_STATUS +EFIAPI +MemEncryptSevClearPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN NumberOfPages, + IN BOOLEAN CacheFlush + ); + +/** + This function sets memory encryption bit for the memory region specified= by + BaseAddress and Number of pages from the current page table context. + + @param[in] BaseAddress The physical address that is the start= address + of a memory region. + @param[in] NumberOfPages The number of pages from start memory = region. + @param[in] Flush Flush the caches before clearing the b= it + (mostly TRUE except MMIO addresses) + + @retval RETURN_SUCCESS The attributes were set for the memory= region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing memory encryption attribute i= s not + supported + **/ +RETURN_STATUS +EFIAPI +MemEncryptSevSetPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN NumberOfPages, + IN BOOLEAN CacheFlush + ); +#endif // _MEM_ENCRYPT_SEV_LIB_H_ diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.= h b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.h new file mode 100644 index 000000000000..17f67b47dbee --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.h @@ -0,0 +1,34 @@ +/** @file + + Secure Encrypted Virtualization (SEV) library helper function + + 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 licen= se may + be found at http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#ifndef _MEM_ENCRYPT_SEV_LIB_INTERNAL_H_ +#define _MEM_ENCRYPT_SEV_LIB_INTERNAL_H_ + +#include + +/** + Returns a boolean to indicate whether SEV is enabled + + @retval TRUE SEV is active + @retval FALSE SEV is not enabled + **/ +BOOLEAN +EFIAPI +InternalMemEncryptSevIsEnabled ( + VOID + ); + +#endif diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h new file mode 100644 index 000000000000..ab5a6ddc3e85 --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.h @@ -0,0 +1,184 @@ +/** @file + + Virtual Memory Management Services to set or clear the memory encryption= bit + +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 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI= ED. + +Code is derived from MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.h + +**/ + +#ifndef __VIRTUAL_MEMORY__ +#define __VIRTUAL_MEMORY__ + +#include +#include +#include +#include +#include + +#include +#define SYS_CODE64_SEL 0x38 + +#pragma pack(1) + +// +// Page-Map Level-4 Offset (PML4) and +// Page-Directory-Pointer Offset (PDPE) entries 4K & 2MB +// + +typedef union { + struct { + UINT64 Present:1; // 0 =3D Not present in memory, 1 = =3D Present in memory + UINT64 ReadWrite:1; // 0 =3D Read-Only, 1=3D Read/Write + UINT64 UserSupervisor:1; // 0 =3D Supervisor, 1=3DUser + UINT64 WriteThrough:1; // 0 =3D Write-Back caching, 1=3DWri= te-Through caching + UINT64 CacheDisabled:1; // 0 =3D Cached, 1=3DNon-Cached + UINT64 Accessed:1; // 0 =3D Not accessed, 1 =3D Accesse= d (set by CPU) + UINT64 Reserved:1; // Reserved + UINT64 MustBeZero:2; // Must Be Zero + UINT64 Available:3; // Available for use by system softw= are + UINT64 PageTableBaseAddress:40; // Page Table Base Address + UINT64 AvabilableHigh:11; // Available for use by system softw= are + UINT64 Nx:1; // No Execute bit + } Bits; + UINT64 Uint64; +} PAGE_MAP_AND_DIRECTORY_POINTER; + +// +// Page Table Entry 4KB +// +typedef union { + struct { + UINT64 Present:1; // 0 =3D Not present in memory, 1 = =3D Present in memory + UINT64 ReadWrite:1; // 0 =3D Read-Only, 1=3D Read/Write + UINT64 UserSupervisor:1; // 0 =3D Supervisor, 1=3DUser + UINT64 WriteThrough:1; // 0 =3D Write-Back caching, 1=3DWri= te-Through caching + UINT64 CacheDisabled:1; // 0 =3D Cached, 1=3DNon-Cached + UINT64 Accessed:1; // 0 =3D Not accessed, 1 =3D Accesse= d (set by CPU) + UINT64 Dirty:1; // 0 =3D Not Dirty, 1 =3D written by= processor on access to page + UINT64 PAT:1; // + UINT64 Global:1; // 0 =3D Not global page, 1 =3D glob= al page TLB not cleared on CR3 write + UINT64 Available:3; // Available for use by system softw= are + UINT64 PageTableBaseAddress:40; // Page Table Base Address + UINT64 AvabilableHigh:11; // Available for use by system softw= are + UINT64 Nx:1; // 0 =3D Execute Code, 1 =3D No Code= Execution + } Bits; + UINT64 Uint64; +} PAGE_TABLE_4K_ENTRY; + +// +// Page Table Entry 2MB +// +typedef union { + struct { + UINT64 Present:1; // 0 =3D Not present in memory, 1 = =3D Present in memory + UINT64 ReadWrite:1; // 0 =3D Read-Only, 1=3D Read/Write + UINT64 UserSupervisor:1; // 0 =3D Supervisor, 1=3DUser + UINT64 WriteThrough:1; // 0 =3D Write-Back caching, 1=3DWri= te-Through caching + UINT64 CacheDisabled:1; // 0 =3D Cached, 1=3DNon-Cached + UINT64 Accessed:1; // 0 =3D Not accessed, 1 =3D Accesse= d (set by CPU) + UINT64 Dirty:1; // 0 =3D Not Dirty, 1 =3D written by= processor on access to page + UINT64 MustBe1:1; // Must be 1 + UINT64 Global:1; // 0 =3D Not global page, 1 =3D glob= al page TLB not cleared on CR3 write + UINT64 Available:3; // Available for use by system softw= are + UINT64 PAT:1; // + UINT64 MustBeZero:8; // Must be zero; + UINT64 PageTableBaseAddress:31; // Page Table Base Address + UINT64 AvabilableHigh:11; // Available for use by system softw= are + UINT64 Nx:1; // 0 =3D Execute Code, 1 =3D No Code= Execution + } Bits; + UINT64 Uint64; +} PAGE_TABLE_ENTRY; + +// +// Page Table Entry 1GB +// +typedef union { + struct { + UINT64 Present:1; // 0 =3D Not present in memory, 1 = =3D Present in memory + UINT64 ReadWrite:1; // 0 =3D Read-Only, 1=3D Read/Write + UINT64 UserSupervisor:1; // 0 =3D Supervisor, 1=3DUser + UINT64 WriteThrough:1; // 0 =3D Write-Back caching, 1=3DWri= te-Through caching + UINT64 CacheDisabled:1; // 0 =3D Cached, 1=3DNon-Cached + UINT64 Accessed:1; // 0 =3D Not accessed, 1 =3D Accesse= d (set by CPU) + UINT64 Dirty:1; // 0 =3D Not Dirty, 1 =3D written by= processor on access to page + UINT64 MustBe1:1; // Must be 1 + UINT64 Global:1; // 0 =3D Not global page, 1 =3D glob= al page TLB not cleared on CR3 write + UINT64 Available:3; // Available for use by system softw= are + UINT64 PAT:1; // + UINT64 MustBeZero:17; // Must be zero; + UINT64 PageTableBaseAddress:22; // Page Table Base Address + UINT64 AvabilableHigh:11; // Available for use by system softw= are + UINT64 Nx:1; // 0 =3D Execute Code, 1 =3D No Code= Execution + } Bits; + UINT64 Uint64; +} PAGE_TABLE_1G_ENTRY; + +#pragma pack() + +#define IA32_PG_P BIT0 +#define IA32_PG_RW BIT1 + +#define PAGETABLE_ENTRY_MASK ((1UL << 9) - 1) +#define PML4_OFFSET(x) ( (x >> 39) & PAGETABLE_ENTRY_MASK) +#define PDP_OFFSET(x) ( (x >> 30) & PAGETABLE_ENTRY_MASK) +#define PDE_OFFSET(x) ( (x >> 21) & PAGETABLE_ENTRY_MASK) +#define PTE_OFFSET(x) ( (x >> 12) & PAGETABLE_ENTRY_MASK) +#define PAGING_1G_ADDRESS_MASK_64 0x000FFFFFC0000000ull + +/** + This function clears memory encryption bit for the memory region specifi= ed by PhysicalAddress + and length from the current page table context. + + @param[in] PhysicalAddress The physical address that is the sta= rt address of a memory region. + @param[in] Length The length of memory region + @param[in] Flush Flush the caches before applying the= encryption mask + + @retval RETURN_SUCCESS The attributes were cleared for the = memory region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Setting the memory encyrption attrib= ute is not supported +**/ +EFI_STATUS +EFIAPI +SetMemoryDecrypted ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINT64 Length, + IN BOOLEAN CacheFlush + ); + +/** + This function sets memory encryption bit for the memory region specified= by + PhysicalAddress and length from the current page table context. + + @param[in] PhysicalAddress The physical address that is the sta= rt address + of a memory region. + @param[in] Length The length of memory region + @param[in] Flush Flush the caches before applying the + encryption mask + + @retval RETURN_SUCCESS The attributes were cleared for the = memory region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Setting the memory encyrption attrib= ute is + not supported +**/ +EFI_STATUS +EFIAPI +SetMemoryEncrypted ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINT64 Length, + IN BOOLEAN CacheFlush + ); + +#endif diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c b= /OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c new file mode 100644 index 000000000000..4b7f421475ac --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/Ia32/MemEncryptSevLib.c @@ -0,0 +1,126 @@ +/** @file + + Secure Encrypted Virtualization (SEV) library helper function + + 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 licen= se may + be found at http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include "Uefi.h" +#include +#include +#include +#include +#include +#include + +#include "MemEncryptSevLibInternal.h" + +/** + + Returns a boolean to indicate whether SEV is enabled + + @retval TRUE SEV is enabled + @retval FALSE SEV is not enabled + **/ +BOOLEAN +EFIAPI +InternalMemEncryptSevIsEnabled ( + VOID + ) +{ + UINT32 RegEax; + MSR_SEV_STATUS_REGISTER Msr; + CPUID_MEMORY_ENCRYPTION_INFO_EAX Eax; + + // + // Check if memory encryption leaf exist + // + AsmCpuid (CPUID_EXTENDED_FUNCTION, &RegEax, NULL, NULL, NULL); + if (RegEax >=3D CPUID_MEMORY_ENCRYPTION_INFO) { + // + // CPUID Fn8000_001F[EAX] Bit 1 (Sev supported) + // + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, &Eax.Uint32, NULL, NULL, NULL); + + if (Eax.Bits.SevBit) { + // + // Check MSR_0xC0010131 Bit 0 (Sev is Enabled) + // + Msr.Uint32 =3D AsmReadMsr32 (MSR_SEV_STATUS); + if (Msr.Bits.SevBit) { + return TRUE; + } + } + } + + return FALSE; +} + +/** + This function clears memory encryption bit for the memory region specifi= ed + by BaseAddress and Number of pages from the current page table context. + + @param[in] BaseAddress The physical address that is the start= address + of a memory region. + @param[in] NumberOfPages The number of pages from start memory = region. + @param[in] Flush Flush the caches before clearing the b= it + (mostly TRUE except MMIO addresses) + + @retval RETURN_SUCCESS The attributes were cleared for the me= mory region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing memory encryption attribute i= s not + supported + **/ +RETURN_STATUS +EFIAPI +MemEncryptSevClearPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN NumberOfPages, + IN BOOLEAN Flush + ) +{ + // + // Memory encryption bit is not accessible in 32-bit mode + // + return RETURN_UNSUPPORTED; +} + +/** + This function sets memory encryption bit for the memory region specified= by + BaseAddress and Number of pages from the current page table context. + + @param[in] BaseAddress The physical address that is the start= address + of a memory region. + @param[in] NumberOfPages The number of pages from start memory = region. + @param[in] Flush Flush the caches before clearing the b= it + (mostly TRUE except MMIO addresses) + + @retval RETURN_SUCCESS The attributes were set for the memory= region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing memory encryption attribute i= s not + supported + **/ +RETURN_STATUS +EFIAPI +MemEncryptSevSetPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN NumberOfPages, + IN BOOLEAN Flush + ) +{ + // + // Memory encryption bit is not accessible in 32-bit mode + // + return RETURN_UNSUPPORTED; +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.= c b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c new file mode 100644 index 000000000000..43ecba7a28bb --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/MemEncryptSevLibInternal.c @@ -0,0 +1,43 @@ +/** @file + + Secure Encrypted Virtualization (SEV) library helper function + + 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 licen= se may + be found at http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include "MemEncryptSevLibInternal.h" + +STATIC BOOLEAN mSevStatus =3D FALSE; +STATIC BOOLEAN mSevStatusChecked =3D FALSE; + +/** + + Returns a boolean to indicate whether SEV is enabled + + @retval TRUE SEV is enabled + @retval FALSE SEV is not enabled + **/ +BOOLEAN +EFIAPI +MemEncryptSevIsEnabled ( + VOID + ) +{ + if (mSevStatusChecked) { + return mSevStatus; + } + + mSevStatus =3D InternalMemEncryptSevIsEnabled(); + mSevStatusChecked =3D TRUE; + + return mSevStatus; +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c b/= OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c new file mode 100644 index 000000000000..92f701497ffb --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/MemEncryptSevLib.c @@ -0,0 +1,127 @@ +/** @file + + Secure Encrypted Virtualization (SEV) library helper function + + 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 licen= se may + be found at http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include "Uefi.h" +#include +#include +#include +#include +#include +#include + +#include "VirtualMemory.h" +#include "MemEncryptSevLibInternal.h" + +/** + + Returns a boolean to indicate whether SEV is enabled + + @retval TRUE SEV is enabled + @retval FALSE SEV is not enabled + **/ +BOOLEAN +EFIAPI +InternalMemEncryptSevIsEnabled ( + VOID + ) +{ + UINT32 RegEax; + MSR_SEV_STATUS_REGISTER Msr; + CPUID_MEMORY_ENCRYPTION_INFO_EAX Eax; + + // + // Check if memory encryption leaf exist + // + AsmCpuid (CPUID_EXTENDED_FUNCTION, &RegEax, NULL, NULL, NULL); + if (RegEax >=3D CPUID_MEMORY_ENCRYPTION_INFO) { + // + // CPUID Fn8000_001F[EAX] Bit 1 (Sev supported) + // + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, &Eax.Uint32, NULL, NULL, NULL); + + if (Eax.Bits.SevBit) { + // + // Check MSR_0xC0010131 Bit 0 (Sev Enabled) + // + Msr.Uint32 =3D AsmReadMsr32 (MSR_SEV_STATUS); + if (Msr.Bits.SevBit) { + return TRUE; + } + } + } + + return FALSE; +} + +/** + + This function clears memory encryption bit for the memory region specifi= ed by + BaseAddress and Number of pages from the current page table context. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use c= urrent CR3) + @param[in] BaseAddress The physical address that is the sta= rt address + of a memory region. + @param[in] NumberOfPages The number of pages from start memor= y region. + @param[in] Flush Flush the caches before clearing the= bit + (mostly TRUE except MMIO addresses) + + @retval RETURN_SUCCESS The attributes were cleared for the = memory + region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encryption attri= bute is + not supported + **/ +RETURN_STATUS +EFIAPI +MemEncryptSevClearPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN NumPages, + IN BOOLEAN Flush + ) +{ + return SetMemoryDecrypted (Cr3BaseAddress, BaseAddress, EFI_PAGES_TO_SIZ= E(NumPages), Flush); +} + +/** + + This function clears memory encryption bit for the memory region specifi= ed by + BaseAddress and Number of pages from the current page table context. + + @param[in] Cr3BaseAddress Cr3 Base Address (if zero then use c= urrent CR3) + @param[in] BaseAddress The physical address that is the sta= rt address + of a memory region. + @param[in] NumberOfPages The number of pages from start memor= y region. + @param[in] Flush Flush the caches before clearing the= bit + (mostly TRUE except MMIO addresses) + + @retval RETURN_SUCCESS The attributes were cleared for the = memory + region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Clearing the memory encryption attri= bute is + not supported + **/ +RETURN_STATUS +EFIAPI +MemEncryptSevSetPageEncMask ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS BaseAddress, + IN UINTN NumPages, + IN BOOLEAN Flush + ) +{ + return SetMemoryEncrypted (Cr3BaseAddress, BaseAddress, EFI_PAGES_TO_SIZ= E(NumPages), Flush); +} diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/Ovm= fPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c new file mode 100644 index 000000000000..51425830baa5 --- /dev/null +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c @@ -0,0 +1,422 @@ +/** @file + + Virtual Memory Management Services to set or clear the memory encryption= bit + +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 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI= ED. + +Code is derived from MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c + +**/ + +#include +#include +#include + +#include "VirtualMemory.h" + +STATIC BOOLEAN mAddressEncMaskChecked =3D FALSE; +STATIC UINT64 mAddressEncMask; + +typedef enum { + SetCBit, + ClearCBit +} MAP_RANGE_MODE; + +/** + Get the memory encryption mask + + @param[out] EncryptionMask contains the pte mask. + +**/ +STATIC +UINT64 +GetMemEncryptionAddressMask ( + VOID + ) +{ + UINT64 EncryptionMask; + CPUID_MEMORY_ENCRYPTION_INFO_EBX Ebx; + + if (mAddressEncMaskChecked) { + return mAddressEncMask; + } + + // + // CPUID Fn8000_001F[EBX] Bit 0:5 (memory encryption bit position) + // + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, NULL, &Ebx.Uint32, NULL, NULL); + EncryptionMask =3D LShiftU64 (1, Ebx.Bits.PtePosBits); + + mAddressEncMask =3D EncryptionMask & PAGING_1G_ADDRESS_MASK_64; + mAddressEncMaskChecked =3D TRUE; + + return mAddressEncMask; +} + +/** + Split 2M page to 4K. + + @param[in] PhysicalAddress Start physical address the 2M page= covered. + @param[in, out] PageEntry2M Pointer to 2M page entry. + @param[in] StackBase Stack base address. + @param[in] StackSize Stack size. + +**/ +STATIC +VOID +Split2MPageTo4K ( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN OUT UINT64 *PageEntry2M, + IN PHYSICAL_ADDRESS StackBase, + IN UINTN StackSize + ) +{ + PHYSICAL_ADDRESS PhysicalAddress4K; + UINTN IndexOfPageTableEntries; + PAGE_TABLE_4K_ENTRY *PageTableEntry, *PageTableEntry1; + UINT64 AddressEncMask; + + PageTableEntry =3D AllocatePages(1); + + PageTableEntry1 =3D PageTableEntry; + + AddressEncMask =3D GetMemEncryptionAddressMask (); + + ASSERT (PageTableEntry !=3D NULL); + ASSERT (*PageEntry2M & AddressEncMask); + + 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 | AddressEncMask; + PageTableEntry->Bits.ReadWrite =3D 1; + PageTableEntry->Bits.Present =3D 1; + if ((PhysicalAddress4K >=3D StackBase) && (PhysicalAddress4K < StackBa= se + StackSize)) { + // + // Set Nx bit for stack. + // + PageTableEntry->Bits.Nx =3D 1; + } + } + + // + // Fill in 2M page entry. + // + *PageEntry2M =3D (UINT64) (UINTN) PageTableEntry1 | IA32_PG_P | IA32_PG_= RW | AddressEncMask; +} + +/** + Split 1G page to 2M. + + @param[in] PhysicalAddress Start physical address the 1G page= covered. + @param[in, out] PageEntry1G Pointer to 1G page entry. + @param[in] StackBase Stack base address. + @param[in] StackSize Stack size. + +**/ +STATIC +VOID +Split1GPageTo2M ( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN OUT UINT64 *PageEntry1G, + IN PHYSICAL_ADDRESS StackBase, + IN UINTN StackSize + ) +{ + PHYSICAL_ADDRESS PhysicalAddress2M; + UINTN IndexOfPageDirectoryEntries; + PAGE_TABLE_ENTRY *PageDirectoryEntry; + UINT64 AddressEncMask; + + PageDirectoryEntry =3D AllocatePages(1); + + AddressEncMask =3D GetMemEncryptionAddressMask (); + ASSERT (PageDirectoryEntry !=3D NULL); + ASSERT (*PageEntry1G & GetMemEncryptionAddressMask ()); + // + // Fill in 1G page entry. + // + *PageEntry1G =3D (UINT64) (UINTN) PageDirectoryEntry | IA32_PG_P | IA32_= PG_RW | AddressEncMask; + + PhysicalAddress2M =3D PhysicalAddress; + for (IndexOfPageDirectoryEntries =3D 0; IndexOfPageDirectoryEntries < 51= 2; IndexOfPageDirectoryEntries++, PageDirectoryEntry++, PhysicalAddress2M += =3D SIZE_2MB) { + if ((PhysicalAddress2M < StackBase + StackSize) && ((PhysicalAddress2M= + SIZE_2MB) > StackBase)) { + // + // Need to split this 2M page that covers stack range. + // + Split2MPageTo4K (PhysicalAddress2M, (UINT64 *) PageDirectoryEntry, S= tackBase, StackSize); + } else { + // + // Fill in the Page Directory entries + // + PageDirectoryEntry->Uint64 =3D (UINT64) PhysicalAddress2M | AddressE= ncMask; + PageDirectoryEntry->Bits.ReadWrite =3D 1; + PageDirectoryEntry->Bits.Present =3D 1; + PageDirectoryEntry->Bits.MustBe1 =3D 1; + } + } +} + + +/** + Set or Clear the memory encryption bit + + @param[in] PagetablePoint Page table entry pointer (PTE). + @param[in] Mode Set or Clear encryption bit + +**/ +STATIC VOID +SetOrClearCBit( + IN OUT UINT64* PageTablePointer, + IN MAP_RANGE_MODE Mode + ) +{ + UINT64 AddressEncMask; + + AddressEncMask =3D GetMemEncryptionAddressMask (); + + if (Mode =3D=3D SetCBit) { + *PageTablePointer |=3D AddressEncMask; + } else { + *PageTablePointer &=3D ~AddressEncMask; + } + +} + +/** + This function either sets or clears memory encryption bit for the memory= region + specified by PhysicalAddress and length from the current page table cont= ext. + + The function iterates through the physicalAddress one page at a time, an= d set + or clears the memory encryption mask in the page table. If it encounters + that a given physical address range is part of large page then it attemp= ts to + change the attribute at one go (based on size), otherwise it splits the + large pages into smaller (e.g 2M page into 4K pages) and then try to set= or + clear the encryption bit on the smallest page size. + + @param[in] PhysicalAddress The physical address that is the sta= rt + address of a memory region. + @param[in] Length The length of memory region + @param[in] Mode Set or Clear mode + @param[in] Flush Flush the caches before applying the + encryption mask + + @retval RETURN_SUCCESS The attributes were cleared for the = memory + region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Setting the memory encyrption attrib= ute is + not supported +**/ + +STATIC +EFI_STATUS +EFIAPI +SetMemoryEncDec ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINTN Length, + IN MAP_RANGE_MODE Mode, + IN BOOLEAN CacheFlush + ) +{ + PAGE_MAP_AND_DIRECTORY_POINTER *PageMapLevel4Entry; + PAGE_MAP_AND_DIRECTORY_POINTER *PageUpperDirectoryPointerEntry; + PAGE_MAP_AND_DIRECTORY_POINTER *PageDirectoryPointerEntry; + PAGE_TABLE_1G_ENTRY *PageDirectory1GEntry; + PAGE_TABLE_ENTRY *PageDirectory2MEntry; + PAGE_TABLE_4K_ENTRY *PageTableEntry; + UINT64 PgTableMask; + UINT64 AddressEncMask; + + // + // Check if we have a valid memory encryption mask + // + AddressEncMask =3D GetMemEncryptionAddressMask (); + if (!AddressEncMask) { + return RETURN_ACCESS_DENIED; + } + + PgTableMask =3D AddressEncMask | EFI_PAGE_MASK; + + if (Length =3D=3D 0) { + return EFI_INVALID_PARAMETER; + } + + // + // We are going to change the memory encryption attribute from C=3D0 -> = C=3D1 or + // vice versa Flush the caches to ensure that data is written into memor= y with + // correct C-bit + // + if (CacheFlush) { + WriteBackInvalidateDataCacheRange((VOID*) (UINTN)PhysicalAddress, Leng= th); + } + + while (Length) + { + // + // If Cr3BaseAddress is not specified then read the current CR3 + // + if (Cr3BaseAddress =3D=3D 0) { + Cr3BaseAddress =3D AsmReadCr3(); + } + + PageMapLevel4Entry =3D (VOID*) (Cr3BaseAddress & ~PgTableMask); + PageMapLevel4Entry +=3D PML4_OFFSET(PhysicalAddress); + if (!PageMapLevel4Entry->Bits.Present) { + DEBUG ((DEBUG_WARN, "ERROR bad PML4 for %lx\n", PhysicalAddress)); + return EFI_NO_MAPPING; + } + + PageDirectory1GEntry =3D (VOID*) ((PageMapLevel4Entry->Bits.PageTableB= aseAddress<<12) & ~PgTableMask); + PageDirectory1GEntry +=3D PDP_OFFSET(PhysicalAddress); + if (!PageDirectory1GEntry->Bits.Present) { + DEBUG ((DEBUG_WARN, "ERROR bad PDPE for %lx\n", PhysicalAddress)); + return EFI_NO_MAPPING; + } + + // + // If the MustBe1 bit is not 1, it's not actually a 1GB entry + // + if (PageDirectory1GEntry->Bits.MustBe1) { + // + // Valid 1GB page + // If we have at least 1GB to go, we can just update this entry + // + if (!(PhysicalAddress & (BIT30 - 1)) && Length >=3D BIT30) { + SetOrClearCBit(&PageDirectory1GEntry->Uint64, Mode); + DEBUG ((DEBUG_VERBOSE, "Updated 1GB entry for %lx\n", PhysicalAddr= ess)); + PhysicalAddress +=3D BIT30; + Length -=3D BIT30; + } else { + // + // We must split the page + // + DEBUG ((DEBUG_VERBOSE, "Spliting 1GB page\n")); + Split1GPageTo2M(((UINT64)PageDirectory1GEntry->Bits.PageTableBaseA= ddress)<<30, (UINT64*) PageDirectory1GEntry, 0, 0); + continue; + } + } else { + // + // Actually a PDP + // + PageUpperDirectoryPointerEntry =3D (PAGE_MAP_AND_DIRECTORY_POINTER*)= PageDirectory1GEntry; + PageDirectory2MEntry =3D (VOID*) ((PageUpperDirectoryPointerEntry->B= its.PageTableBaseAddress<<12) & ~PgTableMask); + PageDirectory2MEntry +=3D PDE_OFFSET(PhysicalAddress); + if (!PageDirectory2MEntry->Bits.Present) { + DEBUG ((DEBUG_WARN, "ERROR bad PDE for %lx\n", PhysicalAddress)); + return EFI_NO_MAPPING; + } + // + // If the MustBe1 bit is not a 1, it's not a 2MB entry + // + if (PageDirectory2MEntry->Bits.MustBe1) { + // + // Valid 2MB page + // If we have at least 2MB left to go, we can just update this ent= ry + // + if (!(PhysicalAddress & (BIT21-1)) && Length >=3D BIT21) { + SetOrClearCBit (&PageDirectory2MEntry->Uint64, Mode); + DEBUG ((DEBUG_VERBOSE, "Updated 2MB entry for %lx\n", PhysicalAd= dress)); + PhysicalAddress +=3D BIT21; + Length -=3D BIT21; + } else { + // + // We must split up this page into 4K pages + // + DEBUG ((DEBUG_VERBOSE, "Spliting 2MB page at %lx\n", PhysicalAdd= ress)); + Split2MPageTo4K (((UINT64)PageDirectory2MEntry->Bits.PageTableBa= seAddress) << 21, (UINT64*) PageDirectory2MEntry, 0, 0); + continue; + } + } else { + PageDirectoryPointerEntry =3D (PAGE_MAP_AND_DIRECTORY_POINTER*) Pa= geDirectory2MEntry; + PageTableEntry =3D (VOID*) (PageDirectoryPointerEntry->Bits.PageTa= bleBaseAddress<<12 & ~PgTableMask); + PageTableEntry +=3D PTE_OFFSET(PhysicalAddress); + if (!PageTableEntry->Bits.Present) { + DEBUG ((DEBUG_WARN, "ERROR bad PTE for %lx\n", PhysicalAddress)); + return EFI_NO_MAPPING; + } + SetOrClearCBit (&PageTableEntry->Uint64, Mode); + DEBUG ((DEBUG_VERBOSE, "Updated 4KB entry for %lx\n", PhysicalAddr= ess)); + PhysicalAddress +=3D EFI_PAGE_SIZE; + Length -=3D EFI_PAGE_SIZE; + } + } + } + + // + // Flush TLB + // + CpuFlushTlb(); + + return EFI_SUCCESS; +} + +/** + This function clears memory encryption bit for the memory region specifi= ed by + PhysicalAddress and length from the current page table context. + + @param[in] PhysicalAddress The physical address that is the sta= rt + address of a memory region. + @param[in] Length The length of memory region + @param[in] Flush Flush the caches before applying the + encryption mask + + @retval RETURN_SUCCESS The attributes were cleared for the = memory + region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Setting the memory encyrption attrib= ute is + not supported +**/ +EFI_STATUS +EFIAPI +SetMemoryDecrypted ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINTN Length, + IN BOOLEAN CacheFlush + ) +{ + + DEBUG ((DEBUG_VERBOSE, "Clear C-bit Base %Lx Length %Lx flush %d\n", Phy= sicalAddress, Length, CacheFlush)); + return SetMemoryEncDec (Cr3BaseAddress, PhysicalAddress, Length, ClearCB= it, CacheFlush); +} + +/** + This function sets memory encryption bit for the memory region specified= by + PhysicalAddress and length from the current page table context. + + @param[in] PhysicalAddress The physical address that is the sta= rt address + of a memory region. + @param[in] Length The length of memory region + @param[in] Flush Flush the caches before applying the + encryption mask + + @retval RETURN_SUCCESS The attributes were cleared for the = memory + region. + @retval RETURN_INVALID_PARAMETER Number of pages is zero. + @retval RETURN_UNSUPPORTED Setting the memory encyrption attrib= ute is + not supported +**/ +EFI_STATUS +EFIAPI +SetMemoryEncrypted ( + IN PHYSICAL_ADDRESS Cr3BaseAddress, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN UINTN Length, + IN BOOLEAN CacheFlush + ) +{ + DEBUG ((DEBUG_VERBOSE, "Set C-bit Base %Lx Length %Lx flush %d\n", Physi= calAddress, Length, CacheFlush)); + return SetMemoryEncDec (Cr3BaseAddress, PhysicalAddress, Length, SetCBit= , CacheFlush); +} --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454198353795.6047129987119; Wed, 10 May 2017 15:09:58 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CFFE621A16E25; Wed, 10 May 2017 15:09:48 -0700 (PDT) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0613.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::613]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7601821959D44 for ; Wed, 10 May 2017 15:09:47 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:45 +0000 X-Original-To: edk2-devel@lists.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=iO7rikgq6VxmevoM1F1UgJdQ/KS26fG/vymqrn3hWk0=; b=cBUpDJjgyjmv0BhBKnCx8IvTLT9NvqgMV7n1WjR00Ro+ScqLHdystxWZ31odOYMarlmcQ98ZpDorNoJzsvrcOnmHL3rfNLi2frpVKipfB/YPCqHnt9kBZPoOYoK2SfGuxtYuLuICEQ+TA+6tcDP4wi/n3TWWCdDJWCo0mObHw+Q= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:14 -0400 Message-ID: <1494454162-9940-6-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: adf4dff5-1754-4453-63f2-08d497f144a8 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:pGWuLBrlMZ0puzM3aQOcHkGhYhbJBR9dmsqUjstQl/4FurrWbLYDEJgm3KVYTgD8kU/TUgxFEUpIIN14AfSQvP7qUR/6uidSS/6+l0fOdO7mWOapWl2B6A0bV+dVYCqC33gUcuuCQbfbbVMIcHDETR0YJgJ/TkRrb1jZ14gkUZN7YMjzrc9Qe8cISdYKjquHCNbj891g7ldRMv0o07+ew4mnNWkHCN+ZCK9C/Wd+0grDaYQfwkpkgXtDu0Wn0yog1+RXj3zCw5fSoryJxH6/yGcVLk717S2d69xC4RqqXt6KIzujZa7v2tqXogy0sKeMSK6vAJ02khW9CybKb76O7MJhFcLQQGvp6+EdXbeH1AU=; 25:z6pzt2tIu9pEA4RoXlW1fjgN1KPn1tfwPMFwbzz3alZhzQPCxYGWfTYlPP2XNW+DxmtRJIreHcCQRVKNzMMIcOESNK2Ef0mVpjwrK/jgFniLrUPjAyC5ZU73D8T/cl00BcAGjk+GzY4YpFQhyMiLh0csyeItdwVoC3CMbfVT/1jjjGcZoDUf8Bfrl7Yt7yWByI9xOkyud4iyYbmnSGTyGoOqAPvEI5SHnGkaq5EMm1Ha+oeQP4oa+oyTBOic/aMf0FXz9xfPGRoU+ynChI5wjfOm3ztyh7FXz5L6wsKzNcKKwL+8/EVapsgj/D+WUlp41U8Pq8OrWvTc67abOcoIbQ2RhlGfPEO88Ypl6NxWKCq6903L9zQk13o79+EPMbeWoK+fSsqD+ezuh3PAHLue515AGHyTrNNcxVatkMiR1BXU1FPPyK08otqs1cPuMsO8+kXI0sa0Mc42DgwdknJmXetl82Wuo+/cvBzZ4H6Gjyg= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:gZLlM0bYBZ4Ln9LUZB14/H7UG2Kr6quG+AP18Zno7H+zSk7wS2vWtR34MfqzWKggUTv32LQKFzDIw1PFzkUvM5V/Qt70axPvyKzM8UGYNP20FJNCwr27pKF0vEXVmPyeSD24YnySouIWpy+6aFJNzPNoVsfiarNEPVnR0SF6DAvCyjljQ6lJqZq/jq27KHqd5ksnX8b23WXGWee0pf2VaBk2sHh/2KligdhWF3+qWCI=; 20:53yi8F0sN0M97GgeStPsU61JA5FxgZQzPwbWly9zzuUYn85OL294hbBofhGezZcE6AYqHCuyleB8/8jPgwHp/IRRycOjuJfe5wLgxfJfd4WWTK+6RH+lTUyWbIDjHNwWyzhGaVPb+VNY/ObqyJqEMbRpTvHynI6IWdgrDv2Uo/TNMEFc75jgARFOD1feLzt57228n+Y2OK8W0lkGzBcqjHZyynZQD6B5xL5zdBvh5OvuNK8aFTjxzEeV0+Erb2TkhEWr0FAaI/BEy4J5PBAVoh1RJTV0M3Y0Rl6vLYyoOIT30YpCk5i4XQWJoL+k1+o3KI41GzpYxcTxU3Tfq+XLnHsC+L5UkEENFP2tVVjXaC5vwGOXduSHVHpHp7ZgdYwZJsZZlYc3hNg9tKcATB45G3Be7sqh0GPncKH11NT0XCfFhOYVy75fLmRlZqNneX34nCEWGCOG6Vu1NpIZvuTQ+Soz705GOo832ASDUbMcyYZ7HLXNmO1dOaQJu4ZagaxT X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:tPofDdQb4yVzdMVHx+wJnBTtHjQA1MxtFuiuLM9cEYUCNvQS8r22gvo/KbirjBRQoNa5/yMAULDDosFbj+BbUEB6hMGO0QQ5msnwxvdSmGS0FiEdhNgKowIBZxyyp7F3xV0T3Y4NvMXkvsOPR78GuE2PGeXc9iL7UiEM9GxZ5j2B4B4SYlKbeK/SY67HFQgDb7hTvxMyZsj9CzuidAPCU7tGnSo3sVwj931WF7Wsir/qJRBEuSbx5HmKxXbeOMJByfRdTeI3bZjHiVxBT+KZKTVnB/ji8agpmJRwRcMO04her3qxvd8kK8hAfrxLhOetwmRFGBcit+lH9UngE6eM2PMPzX0oIjIRaXzNVEUvBzyi/ayBOGQ7IzJ2rK729RfEbFWV3xWUv/XA+M8LVayeGlyJocMXqp2V8K4uU/NRKfbt8J6iZGh5bUJGPIbHnml20gprumSD+stXq4hFCJQGO01Ci9It8IU751OOkQlRyiSiLcRDH6wxj+P6BCCh0W2KK7WQB93/cEQIav+8vwQ5X2JU3Yjpycr3R/ssdWykmXmEGLXScqDpu7Ad/aX7fUVTubqJcAB0qjPMINp1A9sbRH82CSgBJ2C/QVHpy7Dx8FNASUkf6BiyQodibxs4JMWDeXWhAXuamL1R2ynvJfQY0GSv6nQXOtsCSbQXE5UOkEokKcyPJ2SVP9Im9xi/yfZXxcbEFLYr8nuK1Sld6duY8vSCKYoK1Qn4E5aRwjETZ1qq5EhlFBDuHlZ8iCv/HFaJxLrla70pLRz9f1FZmCqBd3hoERx3yEkNqP2OSr09KBKqpsrs0txhs03to6E8yDS/+++vAtO3R4MZE/aElrUzJqn5XlWUvBKBwuiUJ8rQwWbxiD6XTF8DGVZiRRE21wAm X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(6306002)(54906002)(38730400002)(53376002)(53936002)(966004)(3846002)(6116002)(50226002)(25786009)(81166006)(575784001)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(15188155005)(305945005)(2351001)(16799955002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:QCmvTxYOOY4qY88ovt03wKoLMgyZ6ufn7QOPYz6I+?= =?us-ascii?Q?iOZC++ae9Q/+fKLQIWikRgszbguoD4yXHQrN4C4kohTZr984Z5odO1gObBvz?= =?us-ascii?Q?8GPMVjAhNHKSJFcDWFc5/PADh1HvZX4F8a4erlTkoVlaQYDMTCbzXPZRHQPo?= =?us-ascii?Q?ni3oXqj9z4DSynB3GbB3cct87dZebPU0lOu+3l9sSHSOsdIc6eEs/9tYvUu/?= =?us-ascii?Q?plJLEkO2jl5sbRmKaAcwpbBTOr4LayENpnFqIiRnrUxAGmALArcaWjE7r07r?= =?us-ascii?Q?/y8ctEC4utlqD8OZXSxV3Z/N8p0/exp+pyUQnSzbE15VceLY7nQfRayQN+Xw?= =?us-ascii?Q?RzFw2b0PwMTkfvA4h3aebIRAr24yCJx3s8p4iVMbGgUNZDoZFEI/fAyJMnp1?= =?us-ascii?Q?YRuwgDGJQsar4BJE8vG1pzleoR4Hpe7Sfz+kh4CEkOEsoiIi3U7EIUm3DbWs?= =?us-ascii?Q?z6xoyDAieBDBzyXbMrlFtB30rC6eXAkw1k3ha2tYTxr2gBpJqeaxu9jvMsQc?= =?us-ascii?Q?/FGvVEwT8bvzpsHnRwbuXVDlleW+kdkugouqEgq7nqsvUFMZfewg+daozYKF?= =?us-ascii?Q?6dvq2lSIbWenu8q9pzC896RsdwY7aZmLW8voBtZv/wNnF3YbLvHgWX9mwDxR?= =?us-ascii?Q?Du4wR1qOR+MfY83lH7rj8B46UjrCK191xwyoliEDr9/UOxA5MqfsHrRDObkv?= =?us-ascii?Q?RT4zBAwv/ep4XyOmKPp29ZirPeSPPwNYG3SHScvCyrmhbrk/pWVpaMHBOwIy?= =?us-ascii?Q?sv3O73I7tK4GHEVwrGfPrsel+sRjq+tN2DOS+C3yviiheZ1dq/mqZ24IZzIH?= =?us-ascii?Q?388xb5tWPK4LCyU8cQxAW0UU0Eym6qUgEFZF6U19nIr9jE+hNGZr+FRqYC/g?= =?us-ascii?Q?3R61223mF61Je4dvmJ1EHSrjCfdchE5h7s7NWtVbEQgWM0MEFQHL36AX97pq?= =?us-ascii?Q?jqVa2wsSQMJdgBs7LC2yCAYNBo5+W00zGWUFGKCz9lVuw/XFyRVt+FV85Mhu?= =?us-ascii?Q?HhaIfbAdwMiejy5uYPRDVVfFVTESwjcrmefD0LfbBtzUbW/Z+sMClsF7ASM5?= =?us-ascii?Q?/XX6r7VkpA2GtZ5PwlVHCjNJ8GCPVXh1EeEtf4Evj/Zz75laSnCDPuo74nES?= =?us-ascii?Q?Vhj1d7D5efMBtikwBxt/6hBy7rDp5U22TNsh4lPkpQch7V+uu/rgA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:/0CJnXBQ6XmyPMyJ/8QvLwDJNpwroElgqOwDjb8rdQH1dXrgJs/7Wdh3g8TcbSEsQ4UmSKN/PHzmLctUOhiTtNMv3wMJbWznodcWGtaUQaHWU3ZoUtQSatCBPr0X7YvfJ+2X60gre3+weQKcHcsyQp0QuZ4Yv1ZTdHG2NnhccQuUmC0KeIDPEIUAolAW+JhKbb1nEVTaSOoXGpaaEQ/HLGJ/L63VseLx9hLi7occBm35khjMp6S0Qm6AYnPNyniCoxuag0y7CsR6fJ6wk2kyX0emTbRwNinDg08urf/WrJtUqvGmDshmTSpC9pkaNbzhAn7QvTWWgyZkUqAAw8x6DmNmOHEv/chs+/zvq6kirn/LWNNIKQ0xt08OplPN8iys17ggvGaVMBPij2IzlZn823Mhec6rJ7vaLa6KJn2tt7M2WxjNx+/lAQWww9ZflQtu9lhN0rLQB8Ab6uJWFz3kqlDuvBBNk0dWjk8FBsTcJEawxHJern1jlqt1K8EtEvZAFEi/tBZwJNqzqSJFpfBGXFphBmeTsvBnfnTdPCnFbC4=; 5:zg1VWoa3tubaTiorHGrAnnJa8frxXSNqEaZgF/RtBA92Mp61FQnSOgbIot5NpNdza6GPDIj17LkL2z8KXJbhysHkCTQ6XFbygahCtKua9DZaeN08aEl46c3ChZhd2ZJ4P35rzJS8bsNyH3lqmiFDCw==; 24:oV8uCPoZOOikOV5wqHk0K0BkwmEaSPHFSFEpuM57B6wv4/yYS6tJFxPl2NeQE9yL2kPHikACnYDHrOrtvwYX+GEdbfzhtt+rRxRvXbuGEkI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:tG8b6J/y1d5TWOvePffo8xlvsZrknbIJquh8OH8GjKqkFhNJo2siVurPczs0FijswitHGKpvZF1tpI3vikwLGfRQChLTph78j2Og7NHLNkVhzN1RxtC9AFjAxcthMVzCM/lRYLCHMkvz+0JFv1/VHB6RQbrLXqVY2r9nVgo/VvM4Bq0uXPdPAU7oWWBLhAEvrpgqdVFuFuKcrXxcCB5ZCLh+loWbRF4AvYKHPW+dBoLZqacElMbnvUY/+IiRJZpgPlGDPRvQ8xAQutnv4nQPkrSY+w8hanqM0l1t9cqPeMeB1lUIsOSwA8cZJNGN1/dDMAfqCJbECMSzPPn0fmzYzg==; 20:WjfsDf9jIRDhhkrFtLpogix9F7XJ6BmJS9MmxZ3i0w5uatepGm+jW/AWf4HCo5DFlJpIyvKM9HowS9takgzrqT53RVHFpyKJkvquUiRKu7WUe6fLqIZRZM0Mhlt+kBi/JzNMmvNc1IJ7MMMiFqvZDE52m4XPYO7igSC7hGp+F8cIk+XVej0olQ/E8NHI5TAXTmCC9FePyuvRJdQRYO6axk71gzEl0egdzWFBnYbgYyqkd+hnsMJ7kpMAL7XnOESz X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:45.4146 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 05/13] OvmfPkg/PlatformPei: Set memory encryption PCD when SEV is enabled X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Secure Encrypted Virtualization (SEV) guest VMs have the concept of private and shared memory. Private memory is encrypted with the guest-specific key, while shared memory may be encrypted with hypervisor key. Certain types of memory (namely instruction pages and guest page tables) are always treated as private memory by the hardware. For data memory, SEV guest VMs can choose which pages they would like to be private. The choice is done using the standard CPU page tables using the C-bit. When building the initial page table we mark all the memory as private. The patch sets the memory encryption PCD, the PCD is used by DxeCore when building the initial page table. Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 3 + OvmfPkg/OvmfPkgIa32X64.dsc | 3 + OvmfPkg/OvmfPkgX64.dsc | 3 + OvmfPkg/PlatformPei/PlatformPei.inf | 3 + OvmfPkg/PlatformPei/Platform.h | 5 ++ OvmfPkg/PlatformPei/AmdSev.c | 62 ++++++++++++++++++++ OvmfPkg/PlatformPei/Platform.c | 1 + 7 files changed, 80 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 265f2d2b6d2f..139d54aa010e 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -530,6 +530,9 @@ [PcdsDynamicDefault] gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64 gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds|50000 =20 + # Set memory encryption mask + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0 + !if $(SMM_REQUIRE) =3D=3D TRUE gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01 gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 3b50a2dd2d2f..9403f76ce862 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -538,6 +538,9 @@ [PcdsDynamicDefault] gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64 gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds|50000 =20 + # Set memory encryption mask + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0 + !if $(SMM_REQUIRE) =3D=3D TRUE gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01 gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 82c73331aa9f..e137143f7afa 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -537,6 +537,9 @@ [PcdsDynamicDefault] gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64 gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds|50000 =20 + # Set memory encryption mask + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0 + !if $(SMM_REQUIRE) =3D=3D TRUE gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01 gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000 diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index 53c6dd445a0e..a9a7a76c7325 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -29,6 +29,7 @@ [Defines] # =20 [Sources] + AmdSev.c Cmos.c FeatureControl.c Fv.c @@ -60,6 +61,7 @@ [LibraryClasses] QemuFwCfgLib QemuFwCfgS3Lib MtrrLib + MemEncryptSevLib PcdLib =20 [Pcd] @@ -94,6 +96,7 @@ [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack gEfiMdeModulePkgTokenSpaceGuid.PcdPropertiesTableEnable gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable + gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask gUefiCpuPkgTokenSpaceGuid.PcdCpuLocalApicBaseAddress gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h index 18f42c3f0ea8..a7729b9df44b 100644 --- a/OvmfPkg/PlatformPei/Platform.h +++ b/OvmfPkg/PlatformPei/Platform.h @@ -88,6 +88,11 @@ XenDetect ( VOID ); =20 +VOID +AmdSevInitialize ( + VOID + ); + extern BOOLEAN mXen; =20 VOID diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c new file mode 100644 index 000000000000..26f7c3fdbb13 --- /dev/null +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -0,0 +1,62 @@ +/**@file + Initialize Secure Encrypted Virtualization (SEV) support + + Copyright (c) 2017, Advanced Micro Devices. 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 licen= se + may be found at http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ +// +// The package level header files this module uses +// +#include + +#include +#include +#include +#include +#include + +/** + + Function checks if SEV support is available, if present then it sets + the dynamic PcdPteMemoryEncryptionAddressOrMask with memory encryption m= ask. + + **/ +VOID +EFIAPI +AmdSevInitialize ( + VOID + ) +{ + CPUID_MEMORY_ENCRYPTION_INFO_EBX Ebx; + UINT64 EncryptionMask; + RETURN_STATUS PcdStatus; + + // + // Check if SEV is enabled + // + if (!MemEncryptSevIsEnabled ()) { + return; + } + + // + // CPUID Fn8000_001F[EBX] Bit 0:5 (memory encryption bit position) + // + AsmCpuid (CPUID_MEMORY_ENCRYPTION_INFO, NULL, &Ebx.Uint32, NULL, NULL); + EncryptionMask =3D LShiftU64 (1, Ebx.Bits.PtePosBits); + + // + // Set Memory Encryption Mask PCD + // + PcdStatus =3D PcdSet64S (PcdPteMemoryEncryptionAddressOrMask, Encryption= Mask); + ASSERT_RETURN_ERROR (PcdStatus); + + DEBUG ((DEBUG_INFO, "SEV is enabled (mask 0x%lx)\n", EncryptionMask)); +} diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index 5e983a8dcea9..5121e337bdcb 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -678,6 +678,7 @@ InitializePlatform ( NoexecDxeInitialization (); } =20 + AmdSevInitialize (); MiscInitialization (); InstallFeatureControlCallback (); =20 --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454201211134.80886600912527; Wed, 10 May 2017 15:10:01 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1E04121A16E2A; Wed, 10 May 2017 15:09:51 -0700 (PDT) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::631]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0143821A16E27 for ; Wed, 10 May 2017 15:09:49 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:46 +0000 X-Original-To: edk2-devel@lists.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=fD0yB6D08s04cxVNl71N9U10nR+Fdv+D9W5lLVtepfc=; b=G7Md2+FHsaZnXZIyA26G0oKdfSnZ5mY3xVyvcV+KoHwMSfbgk6ISkEUgLU+6AhjSmcPt3iOLXzq1ghdg74cz/Ufml93/OmhhbCnsF1hNHVNVFP8laCwNWgrHoiyVK0awWm7bhrgomjTucwiEUBmf9QGWxTtVkpz5zGvTNf/doRc= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:15 -0400 Message-ID: <1494454162-9940-7-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a4942422-3fe9-4bd0-ceea-08d497f14547 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:E9z9Qb2Jl17acRgf2navp82jRMZUs14RXlruh+lCm/vYyHSFx2alAGPp0X/moKiRosw48J3zoMYoiLprWj4T/HCNHm9LXIldemNJ7AuUO2mr+oRDlk6hUS02+3nKyxcHmYN+BHzUAPgVNclAXaORZHJaCLkOzhmiwqlysH9SK3y+GfjSDMqgip+J2/edRM0dS4yXwLHykwc7vk8Sgfli1qkKFCXe26P6hx/Xb5GL+tNcj5tRGYzJb7pXLbvEUQ4H+Iz7GaxErXd/g33BgSpVLhkMwJvQvn3vFMWD4R4CqtTMO7L79/+1at16ZNdsJeHMO+FKJ4iWY05FIMhYObWpKq2CP7r6dpcldyXI59OsG7w=; 25:uVlxhOw61aBueeYY8Kyu1kifvgOF9DrLZsb+MjTmQN8Rliz0taV9Sz7X8+6QeHo4jzTX9o/gu9ffe/ZuvObMuupAJP2bdAeeQpgodOILmuL+03rwtqeA4I3+43J8Spr9dDrwbenPidmmd016tDbOny4GGcuKPFHJs8BZDwgtqn/2pm4ZmiI5aEtQNIOH304gSszYQpuLDY1U9BWQy5O7SMv2swl13tyAdFnS4E9EZgGM289aC98MNo2Uek2Cc3EV4D3OmwS2Ci+fKu0iqLv3mxw1wW2fcFhDmWjWlWDXsV1woEV3rHtn+U0MNM+ORrmrOrrkcGxcwoXnU60+M4w4FQq8JKqpa1US+hzgiCwBEHf4XHnD+7KCKbPAXM9pd8tBzR3vLg8QvmkXKtOlJ4pRNKwCI0j+B23oZzs3Nf1kCy9+0aClORqntlHIdKvY9+opIgTmeE3KGlZk8mClYVFmz2ha/YmF7lIM26R8o4eUqBw= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:Br0hHgtuYqBdCd2bxXMRf5W0cfPCGJ0fiYmPuk50izb0aazN3f6U6W7vuxBGY6rKPRi+b7JocvSwpX5PI0NqFc3VLkpu7N8AbTJZ+3Fi5FdXddoGWoXMEwwmyAL/DYLrWJC23js2+hFOWFlzjnvi6CRbSSrpRPMWbi+FcO6S8AXutXjq7ao5HVXnTNui9rIfhP6sh79p/oV22nx+3pteEopwE7IYlrrPTKdvrjw+MyaJW2XGr78YHEuU5RgqRxSW8BE/hmYyGWKiecsnBVaxJw==; 20:zSWApdxC3eUzetRShdEuTZuYk9QR2cNgJ9A2avcRsDe8gEKZbE4oaO4eVpDfl1QiPamtP8ber67rUWHmRW8sgvI3pR7ueEZ0qG0S72r3wNxB0zJRnIg2impmuA48w1hDGmIjVjZSi+KyfsFULTKN3M/45MyavM3r/lNuosQk74estDEdsOg7XQ3fTzqrnIgrV2cZeR4DJlhcec6A7lXQfe+Qj7E1eP02VX46xpggaX32dnk9e1CRXMYIvs4UyHb9VlriV97bAZY/rAib78CeK18A1NwZHCn3xikMZloqHZvxYUGP/ZxnByIpgM/rDtaU/HVGhb+aM2a5lZmh79+sid84p+ztY8PkTNfugqVh1Dn57eVEsx1KTE/PRDmnV2VVEmg1IDuknm9pFiWWC0BvFdv9UfibBLLcSe0k4AZlCtUf46bYra36OUCvkgLWZizBDLXZaYZuZpJMUmhtgA1gcFvxhwoEz+Bb8O3giEJK2gh0pEaDSO7OZXGgVG59vEkn X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(162533806227266)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:uGQY7MybBOXMYlh2DJ+PimThAjDlKdboLxkhSX/EZ9PnHeqebpCVcT4N4y1gNpJ0zYBYitdJOLCngsqDLsMhtNm/mv2n6FTrSiGU7zi+KnqCJ1NXfvZB3iXOhGBARTxF5/6vhaxFHr7TezryPy/GINzbxSdhzPpnQ8qP7tuorZ0OEjJgHO9vAJtsnbxy/YYxmbFeKA6f6l/kFBYlijCoNWJVmgMCqQiXwsRTp5e3Q4JQbei7ygyvU4MvITD3SHEiUHroFOTYvrkfJtQBnjBFLyU8RY7s4BvqkTFIlZzAInDibYn7fM1a5ouDecx8J3bJvJ7w/Eqy7IVy5E7e/1l5IGqTc9hxSbeLXWP8aYz6GlkbGPFXi7uqVbw4GLWw6u/vDE/tt1Um8a9TlaenaRIXShXS49E0hLcxgxQ33O7bZhKS6mfQyrx98n7sr6uF5M/Uaetb/0FR97jiHnm23EYKtgEjSt139rpNplDJfZMyd4AmACtIjewRJL4qnmeDGw0mIjM+uP6iXsZppKD/50TK3H8AAFYqqNGuL0JbqWvBENpmwfylcJdoz+SNC4KqJ7xyR8a+jmm2v/8nz3y6AiHzu3ILtk+LJc/b8MXomZn6qtBlpM8jsDeceD/EqmE+s9i5+nHy+vIyBqDyhkUZZeM8QCu96g+8ouhk1rkpPybb6CY6DShdfVKKbpFESCNM8Xw3RSSEYKIrLXnGo8sTC6xXDsbeFTcfGohIRwFrn/8WIJ0M8RaCgt8ETQi7n33MNgs9biQ7aPxKc8nrl7Jm6mIazqA7mM5xXF1Ax/eKybvi8jh+87XD2vu34uhziBZsWQSXsKhWYauAzFC9FGJ4CjOPmarw16k/v9yAPHOxhZ5zYQ+xH6DCuS/D7dWgohFpRytFhy2kVorNmjC42tHBAtkkNxHgH0cnzhYa5uFgarMkzGE= X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(6306002)(54906002)(38730400002)(53376002)(53936002)(966004)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(15188155005)(305945005)(2351001)(16799955002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:WMjLJYs6WcJtJAqG0AeuxL+22a61kLUvs/e7uzSZ6?= =?us-ascii?Q?0F6XHOppaXdIe3RMhjsNU7wWbzNpOKjkPITSraFHv4rZfkvEFv5lsPCBkQtU?= =?us-ascii?Q?YFJhv5xiKtjVsJu1rL14Z/flA+p+pqW71FU7OMgPyItncYfSEyWh5VnEazLk?= =?us-ascii?Q?Pi5p5YYhuY1ZoDnIo8DkZcd1B8SqxcrQZcL1nrGZ51KQ993ozDkg/Nz6W4tH?= =?us-ascii?Q?WVGHd8vxc9BSLS2W2tJRyqMuYAjLuH5YTunfsDF5Nrg9U0gHB2KyBaSN60oE?= =?us-ascii?Q?aV4pMzUWVvKrQ1Ko97qHjaW5MqPcm+CqNyXLQjHSYgEjHSVBMzwSXigxzlOd?= =?us-ascii?Q?ENQ+WvGKUSiazHPAINIGWuDanGuL7d3BCkgfGchRmkxzntnMFyftqmcj+/1d?= =?us-ascii?Q?ztj7ULFc+Gi+hcCI0MuPqSU5px5/x/sm6LbYbeEzqJMB6SQ/q5ca8G827CEo?= =?us-ascii?Q?bler2UHEICx0DUPuwgp7n+tJkqP0JeambXyaqaadoZgxtQ/3ozpwE73e/HRd?= =?us-ascii?Q?YEt3F1Wx3p0xxexRjpiBlpc447GWkU7wMyERv20DyJjulF5yg/LvnIceAFMw?= =?us-ascii?Q?FK9aiZLHcK4fGc4AU38w8MxB8oZZx51tPjuhSeRRcyMP8lCIg0rAlSSSWKyK?= =?us-ascii?Q?3iUnTKgiToVduv3CgrnYSrd/HqQ9ZVSTGzy0D9JHAON8Y9E7pKv+3O4weMqq?= =?us-ascii?Q?lbdd8een3QhaU0qRZ3reJpBKzAT4gC3M187kQOvKFaD1WLypYGhzpOlTl3F9?= =?us-ascii?Q?/O5pqzjDdC4qaiIR3TQEVZAP40zHxXmqng1vvvm6cqrKnCYKfTw9ukNEZOeG?= =?us-ascii?Q?go27pandetHcJGagE1SUA1ppnaz6GgntkSqZ1Clact80+t2pR6h447naJqQQ?= =?us-ascii?Q?DEzj2SxeagONB79Glwen1RyJCVEC/nLWbwm4yZEuuJOe/UM9ad5X6IPHrpnJ?= =?us-ascii?Q?pxIba+5Sp9egZwqwVfuH9MMFhMK/WRG1xiwdoMRHAwBmsnfJCq3Ovq3evwtA?= =?us-ascii?Q?/MYMcRnZLIuuLYbLzxY27KmYxGfNv12zpbqFEkQ+hu7IpIP1m/GcFk/5j45E?= =?us-ascii?Q?CPCQGjuLvqwDMLxUYDvvRZJi63ElNu5gjh0JnCTrfR+ugKR5iyIO4sAQgEln?= =?us-ascii?Q?JBpcZvlgVIOHWHCP37PzLrgj9qjhNeq?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:a8wIAk4ffw+afLkd6g6h84VL/YZBR4eVRlnyzxrFqTBRKcCyqSwMyonLhVOAoIJOK0U3/h8i+8EB1ODLEBJRBMl3kCZUgsQZEaWC2a6mA6EUyFNFPdecMbuMP4FlXjVUx4gxHr3EPfPtYTw9xUZN2rOLCtByuva5J/+xk9d8BiVrtVvYV6eT1tQ7BRr7tgSl9FTTB14amweoEPXbbk9ju4udHswpbdYQUoDyqCHE1+4rFxeS7kLayn1CzEgZTtyZXZsicVgKW5Thm3IXd3kiEo8E3DRK1Xgrqj5o0nDsypBpCEz8gZ5tgm/TnUcObTLFIvBVfJ4GGwyBeHNBX6CXjeV6EXNufW/t5XE6ZY71BDKWQzYwKuXQl926D/HHCrdzDWlvrAh3Tb21EpRnA0TZ+07qzXJM+ktcoSDoD+E7WBaYqACM1XYaeM8yS+CL15ThqevsVEwZh+54s+BVOiFr4yjamhqhqaVhcIb5XQj6FKgF0epNb+owj6WjDsVP11eAnb/JMI9LXNHQBLVNrDWZeYNCPENlEGkDDH3iN0X/5Dg=; 5:yKCRV+2BzvuJvpgOiJyl4jNq4VAR+Wm1LCcfLLiz2sn7b6+Jb59gkeMmDM962qjGwf+vXg01jRvldq+4M4Ffz4LgmT/aFRM7qUzJV5z2ySQ+MYQC1ND5IkVhBnOLd/X4KIvpvD2iL/FMT11cr4GOjg==; 24:BrWhLXURmmJC/SWo8xWPBBcAN3kAMd4lJ7mgCbnVfqn1q6zq5OnmaytJsMeGy3J3mZbwYQCf8j7EzxFYFLhOYpZ1HheO0ar0tf1tBoj/jaw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:GEUEW9IfL3lqAJCd8v908bGhFainPXiFxm/mWvuywtze9AfdJnyivYcuKbwOLcZEZQwOLVqt6vZxvdbOI+ehhjk+hxcyNT8QHan02dx8omxRRQbiOg1YfP2Kd8eC6ourqkTSnmy7pMTv6ZziT8ibmi9tkicuMDXT9eixpvl+Mva3mZ4plo42obGEsVdn8y6XlOxzgprm23x8p68lzaZZe5haxu/UwERXENtRo3yQpEe8i3exHOUeTDHa+cJeEMJ0L6y3FKZD95n8/I1MYXg4eOWAXz+h5OupQfSfZZ2Kwk/HylJ6Y4y2sS5hdyEB6ZAIhKpcf9LIhJOo5oocttlf8g==; 20:PE6U6SUS4L4QQZnM8k34auqX41x0tRq2LwvqvuRGFDJg9vFcPx4mzBMH9GBZ4TftKEgRU9iiwn6RK+wCv8zmTtrlLGRCT1GOxnjax1iMXDtJtk/M20ytBZRbx3eiREpUJZu85g8WH4ihFWzddGIK1SXG6b2XyZRxhNlXF+G/MWc3JzS6Lfb2mVd6dCUAbF1MglEwEmOg797ucUvCWlvu3sinWCqxBgw+AgFGmQBd63CnOuFn0YFg8XtkM45RjJQG X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:46.3843 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 06/13] OvmfPkg:AmdSevDxe: add AmdSevDxe driver X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, Jordan Justen , Jiewen Yao , leo.duran@amd.com, Laszlo Ersek Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When SEV is enabled, the MMIO memory range must be mapped as unencrypted (i.e C-bit cleared) and DMA must be performed on unencrypted memory. The patch adds a DXE driver that runs early in boot and clears the memory encryption attribute from MMIO/NonExistent memory ranges and installs a IOMMU protocol to provide the DMA support for PCIHostBridge and other drive= rs. The driver produces IOMMU protocol introduce by Jiewen https://lists.01.org/pipermail/edk2-devel/2017-May/010462.html Cc: Jordan Justen Cc: Laszlo Ersek Cc: Leo Duran Cc: Jiewen Yao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Jiewen.yao@intel.com Reviewed-by: Laszlo Ersek Suggested-by: Jiewen Yao --- OvmfPkg/OvmfPkgIa32X64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.fdf | 2 + OvmfPkg/OvmfPkgX64.fdf | 2 + OvmfPkg/AmdSevDxe/AmdSevDxe.inf | 49 +++ OvmfPkg/AmdSevDxe/AmdSevIommu.h | 43 ++ OvmfPkg/AmdSevDxe/AmdSevMmio.h | 41 ++ OvmfPkg/AmdSevDxe/AmdSevDxe.c | 52 +++ OvmfPkg/AmdSevDxe/AmdSevIommu.c | 459 ++++++++++++++++++++ OvmfPkg/AmdSevDxe/AmdSevMmio.c | 50 +++ 10 files changed, 700 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 9403f76ce862..ee6f98d68b73 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -827,6 +827,7 @@ [Components.X64] !endif =20 OvmfPkg/PlatformDxe/Platform.inf + OvmfPkg/AmdSevDxe/AmdSevDxe.inf =20 !if $(SMM_REQUIRE) =3D=3D TRUE OvmfPkg/SmmAccess/SmmAccess2Dxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index e137143f7afa..b5f26e06e60b 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -825,6 +825,7 @@ [Components] !endif =20 OvmfPkg/PlatformDxe/Platform.inf + OvmfPkg/AmdSevDxe/AmdSevDxe.inf =20 !if $(SMM_REQUIRE) =3D=3D TRUE OvmfPkg/SmmAccess/SmmAccess2Dxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 5233314139bc..12871860d001 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -190,6 +190,7 @@ [FV.DXEFV] APRIORI DXE { INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf + INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf !if $(SMM_REQUIRE) =3D=3D FALSE INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf !endif @@ -351,6 +352,7 @@ [FV.DXEFV] INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf INF OvmfPkg/PlatformDxe/Platform.inf +INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf =20 !if $(SMM_REQUIRE) =3D=3D TRUE INF OvmfPkg/SmmAccess/SmmAccess2Dxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 36150101e784..ae6e66a1c08d 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -190,6 +190,7 @@ [FV.DXEFV] APRIORI DXE { INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf + INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf !if $(SMM_REQUIRE) =3D=3D FALSE INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf !endif @@ -351,6 +352,7 @@ [FV.DXEFV] INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf INF OvmfPkg/PlatformDxe/Platform.inf +INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf =20 !if $(SMM_REQUIRE) =3D=3D TRUE INF OvmfPkg/SmmAccess/SmmAccess2Dxe.inf diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf b/OvmfPkg/AmdSevDxe/AmdSevDxe.= inf new file mode 100644 index 000000000000..775dda9be386 --- /dev/null +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf @@ -0,0 +1,49 @@ +#/** @file +# +# Driver clears the encryption attribute from MMIO regions and installs I= OMMU +# protcol to provides DMA support for PciHostBridge and others +# +# Copyright (c) 2017, AMD Inc. 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 lice= nse may +# be found at http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IM= PLIED. +# +#**/ + +[Defines] + INF_VERSION =3D 1.25 + BASE_NAME =3D AmdSevDxe + FILE_GUID =3D 2ec9da37-ee35-4de9-86c5-6d9a81dc38a7 + MODULE_TYPE =3D DXE_DRIVER + VERSION_STRING =3D 1.0 + ENTRY_POINT =3D AmdSevDxeEntryPoint + +[Sources] + AmdSevDxe.c + AmdSevIommu.c + AmdSevMmio.c + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + OvmfPkg/OvmfPkg.dec + +[LibraryClasses] + BaseLib + UefiLib + UefiDriverEntryPoint + UefiBootServicesTableLib + DxeServicesTableLib + DebugLib + MemEncryptSevLib + +[Protocols] + gEdkiiIoMmuProtocolGuid ## PRODUCES + +[Depex] + TRUE diff --git a/OvmfPkg/AmdSevDxe/AmdSevIommu.h b/OvmfPkg/AmdSevDxe/AmdSevIomm= u.h new file mode 100644 index 000000000000..5712cb57052d --- /dev/null +++ b/OvmfPkg/AmdSevDxe/AmdSevIommu.h @@ -0,0 +1,43 @@ +/** @file + + The protocol provides support to allocate, free, map and umap a DMA buff= er for + bus master (e.g PciHostBridge). When SEV is enabled, the DMA operations = must + be performed on unencrypted buffer hence protocol clear the encryption b= it + from the DMA buffer. + + Copyright (c) 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2017, AMD Inc. All rights reserved.
+ This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#ifndef __AMDSEVIOMMU_H_ +#define __AMDSEVIOMMU_H + +#include + +#include +#include +#include +#include +#include +#include + +/** + Install IOMMU protocol to provide the DMA support for PciHostBridge and + MemEncryptSevLib. + +**/ +VOID +EFIAPI +AmdSevInstallIommuProtocol ( + VOID + ); + +#endif diff --git a/OvmfPkg/AmdSevDxe/AmdSevMmio.h b/OvmfPkg/AmdSevDxe/AmdSevMmio.h new file mode 100644 index 000000000000..c6191025d921 --- /dev/null +++ b/OvmfPkg/AmdSevDxe/AmdSevMmio.h @@ -0,0 +1,41 @@ +/** @file + + Implements routines to clear C-bit from MMIO Memory Range + + Copyright (c) 2017, AMD Inc. All rights reserved.
+ + This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#ifndef __AMDSEVMMIO_H_ +#define __AMDSEVMMIO_H + +#include +#include +#include +#include +#include +#include +#include + +/** + + Iterate through the GCD map and clear the C-bit from MMIO and NonExistent + memory space. The NonExistent memory space will be used for mapping the = MMIO + space added later (eg PciRootBridge). By clearing both known NonExistent + memory space can gurantee that any MMIO mapped later will have C-bit cle= ared. +*/ +VOID +EFIAPI +AmdSevClearEncMaskMmioRange ( + VOID + ); + +#endif diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c new file mode 100644 index 000000000000..e22e7ef7314f --- /dev/null +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -0,0 +1,52 @@ +/** @file + + AMD Sev Dxe driver. The driver runs early in DXE phase and clears C-bit = from + MMIO space and installs EDKII_IOMMU_PROTOCOL to provide the support for = DMA + operations when SEV is enabled. + + Copyright (c) 2017, AMD Inc. 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 licen= se may + be found at http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include + +#include + +#include "AmdSevMmio.h" +#include "AmdSevIommu.h" + +EFI_STATUS +EFIAPI +AmdSevDxeEntryPoint ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + // + // Do nothing when SEV is not enabled + // + if (!MemEncryptSevIsEnabled ()) { + return EFI_SUCCESS; + } + + // + // Clear C-bit from MMIO Memory Range + // + AmdSevClearEncMaskMmioRange (); + + // + // Install IOMMU protocol to provide DMA support for PCIHostBridgeIo and + // AmdSevMemEncryptLib. + // + AmdSevInstallIommuProtocol (); + + return EFI_SUCCESS; +} diff --git a/OvmfPkg/AmdSevDxe/AmdSevIommu.c b/OvmfPkg/AmdSevDxe/AmdSevIomm= u.c new file mode 100644 index 000000000000..9b35469ca34f --- /dev/null +++ b/OvmfPkg/AmdSevDxe/AmdSevIommu.c @@ -0,0 +1,459 @@ +/** @file + AmdSevIommu related function + + The protocol provides support to allocate, free, map and umap a DMA buff= er for + bus master (e.g PciHostBridge). When SEV is enabled, the DMA operations = must + be performed on unencrypted buffer hence we use a bounce buffer to map t= he host + buffer into an unencrypted buffer. + + Copyright (c) 2017, AMD Inc. All rights reserved.
+ + This program and the accompanying materials are licensed and made availa= ble + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include "AmdSevIommu.h" + +typedef struct { + EDKII_IOMMU_OPERATION Operation; + UINTN NumberOfBytes; + UINTN NumberOfPages; + EFI_PHYSICAL_ADDRESS HostAddress; + EFI_PHYSICAL_ADDRESS DeviceAddress; +} MAP_INFO; + +#define NO_MAPPING (VOID *) (UINTN) -1 + +/** + Provides the controller-specific addresses required to access system mem= ory from a + DMA bus master. On SEV guest, the DMA operations must be performed on sh= ared + buffer hence we allocate a bounce buffer to map the HostAddress to a Dev= iceAddress. + The Encryption attribute is removed from the DeviceAddress buffer. + + @param This The protocol instance pointer. + @param Operation Indicates if the bus master is going to re= ad or + write to system memory. + @param HostAddress The system memory address to map to the PC= I controller. + @param NumberOfBytes On input the number of bytes to map. On ou= tput + the number of bytes + that were mapped. + @param DeviceAddress The resulting map address for the bus mast= er PCI + controller to use to + access the hosts HostAddress. + @param Mapping A resulting value to pass to Unmap(). + + @retval EFI_SUCCESS The range was mapped for the returned Numb= erOfBytes. + @retval EFI_UNSUPPORTED The HostAddress cannot be mapped as a comm= on buffer. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + @retval EFI_OUT_OF_RESOURCES The request could not be completed due to = a lack + of resources. + @retval EFI_DEVICE_ERROR The system hardware could not map the requ= ested address. + +**/ +EFI_STATUS +EFIAPI +IoMmuMap ( + IN EDKII_IOMMU_PROTOCOL *This, + IN EDKII_IOMMU_OPERATION Operation, + IN VOID *HostAddress, + IN OUT UINTN *NumberOfBytes, + OUT EFI_PHYSICAL_ADDRESS *DeviceAddress, + OUT VOID **Mapping + ) +{ + EFI_STATUS Status; + EFI_PHYSICAL_ADDRESS PhysicalAddress; + MAP_INFO *MapInfo; + EFI_PHYSICAL_ADDRESS DmaMemoryTop; + EFI_ALLOCATE_TYPE AllocateType; + + if (HostAddress =3D=3D NULL || NumberOfBytes =3D=3D NULL || DeviceAddres= s =3D=3D NULL || + Mapping =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + // + // Make sure that Operation is valid + // + if ((UINT32) Operation >=3D EdkiiIoMmuOperationMaximum) { + return EFI_INVALID_PARAMETER; + } + PhysicalAddress =3D (EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress; + + DmaMemoryTop =3D (UINTN)-1; + AllocateType =3D AllocateAnyPages; + + if (((Operation !=3D EdkiiIoMmuOperationBusMasterRead64 && + Operation !=3D EdkiiIoMmuOperationBusMasterWrite64 && + Operation !=3D EdkiiIoMmuOperationBusMasterCommonBuffer64)) && + ((PhysicalAddress + *NumberOfBytes) > SIZE_4GB)) { + // + // If the root bridge or the device cannot handle performing DMA above + // 4GB but any part of the DMA transfer being mapped is above 4GB, then + // map the DMA transfer to a buffer below 4GB. + // + DmaMemoryTop =3D SIZE_4GB - 1; + AllocateType =3D AllocateMaxAddress; + + if (Operation =3D=3D EdkiiIoMmuOperationBusMasterCommonBuffer || + Operation =3D=3D EdkiiIoMmuOperationBusMasterCommonBuffer64) { + // + // Common Buffer operations can not be remapped. If the common bu= ffer + // if above 4GB, then it is not possible to generate a mapping, so= return + // an error. + // + return EFI_UNSUPPORTED; + } + } + + // + // CommandBuffer was allocated by us (AllocateBuffer) and is already in + // unencryted buffer so no need to create bounce buffer + // + if (Operation =3D=3D EdkiiIoMmuOperationBusMasterCommonBuffer || + Operation =3D=3D EdkiiIoMmuOperationBusMasterCommonBuffer64) { + *Mapping =3D NO_MAPPING; + *DeviceAddress =3D PhysicalAddress; + + return EFI_SUCCESS; + } + + // + // Allocate a MAP_INFO structure to remember the mapping when Unmap() is + // called later. + // + MapInfo =3D AllocatePool (sizeof (MAP_INFO)); + if (MapInfo =3D=3D NULL) { + *NumberOfBytes =3D 0; + return EFI_OUT_OF_RESOURCES; + } + + // + // Initialize the MAP_INFO structure + // + MapInfo->Operation =3D Operation; + MapInfo->NumberOfBytes =3D *NumberOfBytes; + MapInfo->NumberOfPages =3D EFI_SIZE_TO_PAGES (MapInfo->NumberOfBytes= ); + MapInfo->HostAddress =3D PhysicalAddress; + MapInfo->DeviceAddress =3D DmaMemoryTop; + + // + // Allocate a buffer to map the transfer to. + // + Status =3D gBS->AllocatePages ( + AllocateType, + EfiBootServicesData, + MapInfo->NumberOfPages, + &MapInfo->DeviceAddress + ); + if (EFI_ERROR (Status)) { + FreePool (MapInfo); + *NumberOfBytes =3D 0; + return Status; + } + + // + // Clear the memory encryption mask from the device buffer + // + Status =3D MemEncryptSevClearPageEncMask (0, MapInfo->DeviceAddress, Map= Info->NumberOfPages, TRUE); + ASSERT_EFI_ERROR(Status); + + // + // If this is a read operation from the Bus Master's point of view, + // then copy the contents of the real buffer into the mapped buffer + // so the Bus Master can read the contents of the real buffer. + // + if (Operation =3D=3D EdkiiIoMmuOperationBusMasterRead || + Operation =3D=3D EdkiiIoMmuOperationBusMasterRead64) { + CopyMem ( + (VOID *) (UINTN) MapInfo->DeviceAddress, + (VOID *) (UINTN) MapInfo->HostAddress, + MapInfo->NumberOfBytes + ); + } + + // + // The DeviceAddress is the address of the maped buffer below 4GB + // + *DeviceAddress =3D MapInfo->DeviceAddress; + + // + // Return a pointer to the MAP_INFO structure in Mapping + // + *Mapping =3D MapInfo; + + DEBUG ((DEBUG_VERBOSE, "%a Host 0x%Lx Device 0x%Lx Pages 0x%Lx Bytes 0x%= Lx\n", + __FUNCTION__, MapInfo->DeviceAddress, MapInfo->HostAddress, + MapInfo->NumberOfPages, MapInfo->NumberOfBytes)); + + return EFI_SUCCESS; +} + +/** + Completes the Map() operation and releases any corresponding resources. + + @param This The protocol instance pointer. + @param Mapping The mapping value returned from Map(). + + @retval EFI_SUCCESS The range was unmapped. + @retval EFI_INVALID_PARAMETER Mapping is not a value that was returned b= y Map(). + @retval EFI_DEVICE_ERROR The data was not committed to the target s= ystem memory. +**/ +EFI_STATUS +EFIAPI +IoMmuUnmap ( + IN EDKII_IOMMU_PROTOCOL *This, + IN VOID *Mapping + ) +{ + MAP_INFO *MapInfo; + EFI_STATUS Status; + + if (Mapping =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + // + // See if the Map() operation associated with this Unmap() required a ma= pping + // buffer. If a mapping buffer was not required, then this function simp= ly + // buffer. If a mapping buffer was not required, then this function simp= ly + // + if (Mapping =3D=3D NO_MAPPING) { + return EFI_SUCCESS; + } + + MapInfo =3D (MAP_INFO *)Mapping; + + // + // If this is a write operation from the Bus Master's point of view, + // then copy the contents of the mapped buffer into the real buffer + // so the processor can read the contents of the real buffer. + // + if (MapInfo->Operation =3D=3D EdkiiIoMmuOperationBusMasterWrite || + MapInfo->Operation =3D=3D EdkiiIoMmuOperationBusMasterWrite64) { + CopyMem ( + (VOID *) (UINTN) MapInfo->HostAddress, + (VOID *) (UINTN) MapInfo->DeviceAddress, + MapInfo->NumberOfBytes + ); + } + + DEBUG ((DEBUG_VERBOSE, "%a Host 0x%Lx Device 0x%Lx Pages 0x%Lx Bytes 0x%= Lx\n", + __FUNCTION__, MapInfo->DeviceAddress, MapInfo->HostAddress, + MapInfo->NumberOfPages, MapInfo->NumberOfBytes)); + // + // Restore the memory encryption mask + // + Status =3D MemEncryptSevSetPageEncMask (0, MapInfo->DeviceAddress, MapIn= fo->NumberOfPages, TRUE); + ASSERT_EFI_ERROR(Status); + + // + // Free the mapped buffer and the MAP_INFO structure. + // + gBS->FreePages (MapInfo->DeviceAddress, MapInfo->NumberOfPages); + FreePool (Mapping); + return EFI_SUCCESS; +} + +/** + Allocates pages that are suitable for an OperationBusMasterCommonBuffer = or + OperationBusMasterCommonBuffer64 mapping. + + @param This The protocol instance pointer. + @param Type This parameter is not used and must be ign= ored. + @param MemoryType The type of memory to allocate, EfiBootSer= vicesData + or EfiRuntimeServicesData. + @param Pages The number of pages to allocate. + @param HostAddress A pointer to store the base system memory = address + of the allocated range. + @param Attributes The requested bit mask of attributes for t= he allocated range. + + @retval EFI_SUCCESS The requested memory pages were allocated. + @retval EFI_UNSUPPORTED Attributes is unsupported. The only legal = attribute + bits are MEMORY_WRITE_COMBINE and MEMORY_C= ACHED. + @retval EFI_INVALID_PARAMETER One or more parameters are invalid. + @retval EFI_OUT_OF_RESOURCES The memory pages could not be allocated. + +**/ +EFI_STATUS +EFIAPI +IoMmuAllocateBuffer ( + IN EDKII_IOMMU_PROTOCOL *This, + IN EFI_ALLOCATE_TYPE Type, + IN EFI_MEMORY_TYPE MemoryType, + IN UINTN Pages, + IN OUT VOID **HostAddress, + IN UINT64 Attributes + ) +{ + EFI_STATUS Status; + EFI_PHYSICAL_ADDRESS PhysicalAddress; + + // + // Validate Attributes + // + if ((Attributes & EDKII_IOMMU_ATTRIBUTE_INVALID_FOR_ALLOCATE_BUFFER) != =3D 0) { + return EFI_UNSUPPORTED; + } + + // + // Check for invalid inputs + // + if (HostAddress =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + // + // The only valid memory types are EfiBootServicesData and + // EfiRuntimeServicesData + // + if (MemoryType !=3D EfiBootServicesData && + MemoryType !=3D EfiRuntimeServicesData) { + return EFI_INVALID_PARAMETER; + } + + PhysicalAddress =3D (UINTN)-1; + if ((Attributes & EDKII_IOMMU_ATTRIBUTE_DUAL_ADDRESS_CYCLE) =3D=3D 0) { + // + // Limit allocations to memory below 4GB + // + PhysicalAddress =3D SIZE_4GB - 1; + } + Status =3D gBS->AllocatePages ( + AllocateMaxAddress, + MemoryType, + Pages, + &PhysicalAddress + ); + if (!EFI_ERROR (Status)) { + *HostAddress =3D (VOID *) (UINTN) PhysicalAddress; + + // + // Clear memory encryption mask + // + Status =3D MemEncryptSevClearPageEncMask (0, PhysicalAddress, Pages, T= RUE); + ASSERT_EFI_ERROR(Status); + } + + DEBUG ((DEBUG_VERBOSE, "%a Address 0x%Lx Pages 0x%Lx\n", __FUNCTION__, P= hysicalAddress, Pages)); + return Status; +} + +/** + Frees memory that was allocated with AllocateBuffer(). + + @param This The protocol instance pointer. + @param Pages The number of pages to free. + @param HostAddress The base system memory address of the allo= cated range. + + @retval EFI_SUCCESS The requested memory pages were freed. + @retval EFI_INVALID_PARAMETER The memory range specified by HostAddress = and Pages + was not allocated with AllocateBuffer(). + +**/ +EFI_STATUS +EFIAPI +IoMmuFreeBuffer ( + IN EDKII_IOMMU_PROTOCOL *This, + IN UINTN Pages, + IN VOID *HostAddress + ) +{ + EFI_STATUS Status; + + // + // Set memory encryption mask + // + Status =3D MemEncryptSevSetPageEncMask (0, (EFI_PHYSICAL_ADDRESS)(UINTN)= HostAddress, Pages, TRUE); + ASSERT_EFI_ERROR(Status); + + DEBUG ((DEBUG_VERBOSE, "%a Address 0x%Lx Pages 0x%Lx\n", __FUNCTION__, (= UINTN)HostAddress, Pages)); + return gBS->FreePages ((EFI_PHYSICAL_ADDRESS) (UINTN) HostAddress, Pages= ); +} + + +/** + Set IOMMU attribute for a system memory. + + If the IOMMU protocol exists, the system memory cannot be used + for DMA by default. + + When a device requests a DMA access for a system memory, + the device driver need use SetAttribute() to update the IOMMU + attribute to request DMA access (read and/or write). + + The DeviceHandle is used to identify which device submits the request. + The IOMMU implementation need translate the device path to an IOMMU devi= ce ID, + and set IOMMU hardware register accordingly. + 1) DeviceHandle can be a standard PCI device. + The memory for BusMasterRead need set EDKII_IOMMU_ACCESS_READ. + The memory for BusMasterWrite need set EDKII_IOMMU_ACCESS_WRITE. + The memory for BusMasterCommonBuffer need set EDKII_IOMMU_ACCESS_READ= |EDKII_IOMMU_ACCESS_WRITE. + After the memory is used, the memory need set 0 to keep it being prot= ected. + 2) DeviceHandle can be an ACPI device (ISA, I2C, SPI, etc). + The memory for DMA access need set EDKII_IOMMU_ACCESS_READ and/or EDK= II_IOMMU_ACCESS_WRITE. + + @param[in] This The protocol instance pointer. + @param[in] DeviceHandle The device who initiates the DMA access re= quest. + @param[in] Mapping The mapping value returned from Map(). + @param[in] IoMmuAccess The IOMMU access. + + @retval EFI_SUCCESS The IoMmuAccess is set for the memory ran= ge specified by DeviceAddress and Length. + @retval EFI_INVALID_PARAMETER DeviceHandle is an invalid handle. + @retval EFI_INVALID_PARAMETER Mapping is not a value that was returned = by Map(). + @retval EFI_INVALID_PARAMETER IoMmuAccess specified an illegal combinat= ion of access. + @retval EFI_UNSUPPORTED DeviceHandle is unknown by the IOMMU. + @retval EFI_UNSUPPORTED The bit mask of IoMmuAccess is not suppor= ted by the IOMMU. + @retval EFI_UNSUPPORTED The IOMMU does not support the memory ran= ge specified by Mapping. + @retval EFI_OUT_OF_RESOURCES There are not enough resources available = to modify the IOMMU access. + @retval EFI_DEVICE_ERROR The IOMMU device reported an error while = attempting the operation. + +**/ +EFI_STATUS +EFIAPI +IoMmuSetAttribute ( + IN EDKII_IOMMU_PROTOCOL *This, + IN EFI_HANDLE DeviceHandle, + IN VOID *Mapping, + IN UINT64 IoMmuAccess + ) +{ + return EFI_UNSUPPORTED; +} + +EDKII_IOMMU_PROTOCOL mAmdSev =3D { + EDKII_IOMMU_PROTOCOL_REVISION, + IoMmuSetAttribute, + IoMmuMap, + IoMmuUnmap, + IoMmuAllocateBuffer, + IoMmuFreeBuffer, +}; + +/** + Initialize Iommu Protocol. + +**/ +VOID +EFIAPI +AmdSevInstallIommuProtocol ( + VOID + ) +{ + EFI_STATUS Status; + EFI_HANDLE Handle; + + Handle =3D NULL; + Status =3D gBS->InstallMultipleProtocolInterfaces ( + &Handle, + &gEdkiiIoMmuProtocolGuid, &mAmdSev, + NULL + ); + ASSERT_EFI_ERROR (Status); +} diff --git a/OvmfPkg/AmdSevDxe/AmdSevMmio.c b/OvmfPkg/AmdSevDxe/AmdSevMmio.c new file mode 100644 index 000000000000..b623f82b7baa --- /dev/null +++ b/OvmfPkg/AmdSevDxe/AmdSevMmio.c @@ -0,0 +1,50 @@ +/** @file + + Implements routines to clear C-bit from MMIO Memory Range + + Copyright (c) 2017, AMD Inc. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. + +**/ + +#include "AmdSevMmio.h" + +/** + + Iterate through the GCD map and clear the C-bit from MMIO and NonExistent + memory space. The NonExistent memory space will be used for mapping the = MMIO + space added later (eg PciRootBridge). By clearing both known NonExistent + memory space can gurantee that any MMIO mapped later will have C-bit cle= ared. +*/ +VOID +EFIAPI +AmdSevClearEncMaskMmioRange ( + VOID + ) +{ + EFI_STATUS Status; + EFI_GCD_MEMORY_SPACE_DESCRIPTOR *AllDescMap; + UINTN NumEntries; + UINTN Index; + + Status =3D gDS->GetMemorySpaceMap (&NumEntries, &AllDescMap); + if (Status =3D=3D EFI_SUCCESS) { + for (Index =3D 0; Index < NumEntries; Index++) { + CONST EFI_GCD_MEMORY_SPACE_DESCRIPTOR *Desc; + + Desc =3D &AllDescMap[Index]; + if (Desc->GcdMemoryType =3D=3D EfiGcdMemoryTypeMemoryMappedIo || + Desc->GcdMemoryType =3D=3D EfiGcdMemoryTypeNonExistent) { + Status =3D MemEncryptSevClearPageEncMask (0, Desc->BaseAddress, EF= I_SIZE_TO_PAGES(Desc->Length), FALSE); + ASSERT_EFI_ERROR(Status); + } + } + } +} --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454204405213.11208892238233; Wed, 10 May 2017 15:10:04 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5A87321A16E30; Wed, 10 May 2017 15:09:51 -0700 (PDT) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::631]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5A5C621A16E2A for ; Wed, 10 May 2017 15:09:49 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:47 +0000 X-Original-To: edk2-devel@lists.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=fG7sdIAguWfNQL4lzQBgzpe/ynCtM9cFb2KBsyiTGYI=; b=hCP/gt/xdiQnRg9SSRO9wXBohU7Xt8hg8e+uK6gUjuzOLwwCxGT76HydHBBnOL/AlRVcrq8JEjUSgHOatn8n5EWztDYzwO08mYC7I8FXirfjI9bqhMagXYSIuTFqKM+i14MQ408TJ5Z/Ae6+upHkE41suZd+AF9XzRezUptftWk= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:16 -0400 Message-ID: <1494454162-9940-8-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5b306ec3-375c-417d-4cf8-08d497f145dd X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:rMFxO5MAF+M40s/X9Awp/Eqgm70MTokrbA0WdyyiGNcYv2wdn+la1jahrke98i4CFs3Jk+4egR/yLhDkXYGD++iX/XK54YkyUil4ps0eNbFIYF/9ZiQuTM9Y15d+iRUxzDihJzOHfYUSe/heWFxaa5HPewhffVO+jchkDbQOvRQ1e9TlowNtZVN0iP4P45iKXfktz9+jIwi8RjGVeXfrfvkycd0aQuVct2KiMpUR6VxeflHznWAr+BYmL9iuYVCAKM2qH4KAkMY4p9LVUB0Y/mjTe0bl8WA83X83Mm423Or4YyzfO85/38oGZjge80YtEE96Qiq1Ko/1r5OLeP+UBPLZAKsRKd+8OrIwq/FdWtg=; 25:/W2j4wDmf9VCXu5YTncZqS3VPNrM9gEhNzzupRYTzaB28MvPljKPtCVBCJxnexQlqoE07AQftoL6lU+k7FYh7xw6OCYJkVqEp2zHgkXWuLwLJjd8ipdt4gqrhLOSCVWyyATSuChESxz9RLd3z9Whlv47ZTlqb93ez3vsWD6Dh2ccyfWOc1UPRkgwTw1ZngNhD2J2PmzQnYjEZlCy+kCvIDSTGnEYv0SvjoMTMaes7dVzBK8/fv3xbhKx54IFYUgjHeCHbFe827h8QGjbkwBlfz2/OGp+QCoWt7ncf3j7JdfYwYYeXyVno2fHp12Rzh/sXq56RldN6J6CGtlEHC+/U6KfLM/jby0lJWmvREu02cUUNELBOg1IjPlBbd9ZoYokIx8SS9M5tgQZofD0E8tdHyzeSmR2FkO/jnZ0n8mCAE2zmp/uFPmMgju32K1+YLqTi6J0hmv3R0wEsUf0L7fTaE9vmD8URiXfGQsb8NoV9v8= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:KLt9NpPsrLx4lBNT+W7P3zTUkKVwv7QlTQTUxw2ROProAsa+C8KB4Yart6sAt3nAx8VnbJUsaEwm8DUkxxfDiVh5eiDyFGjppeopgTRySBJSc4oP+TC6hLqZpuOhpnrFsji7Sj5kboIOI2jtbYqGzONPPo0uOtbfYEbQYoWgBroSPiEDE5U1d9DujdqQ6EHSmZrD+fy9Gi7UyFqKJi0uEGQ0crtx70R4hs277mKKxd8=; 20:SO0tMclD2sOL9AsCivXP8tj7ZxpcmPCnV7N9W89wr/4OGgNfOj3TGjUOsGNI4silDrni/ojU9xpq8iUbTxAtsC5o9JNgn6QHP5Wkd4YT8v5PBTiiySgpK6YevhshO9ccd7ezCvRIPAkrn8wLQEACv8Eq+9o12wNFsNHlG6YB2HZyJLTD+SyyZPdwLBIzVqvx9Zt4FzSxi/pk9wUwi2s4TWq2vUCbIG/Qn5LHVOu/B3t/kvIYnmgUcqJbsSOOgW/V3VqQRpw+7U9oM2r/ZO0f+YblkWPaT+qCZlQol4LPcU9HwhgNOFigufSONEGZKSHLLTyC8uJAB7WV4NF1K3ykdZ9+4uNBaLaxUKeAWee5ZtYZGkKWIMd3zpuJtD+stRDeZKl6o/6uaYJ20BL/Qkkqn3JUlYiN1QB0gWODYsxrScy2/VyAbfwQF7DjCtbJGffo3nqGgTQ/w+S578zCnH82KhLIR7UrZrQKD5EYF8gPpU98hm+hm0R+sSdf2sChL8rP X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:aUlGMKj3Cy6v1laWT1c58qiCPBLPk96s0bSYjHTz72SO+FfvPXU9+9jbUS30sGQDMzDIN7UkC8rHR6wmXaWL+ms7sFQkima0M7QRDuKicze/fpqGF49g6STYbKwIwuBUnt8arInkdQ75futif0277171FJrKrMQKcLC7oiZMIpEwuu+bJOWeaZ6Q2cCTusrGCSbvX6WCddvMRWI5wx9454JpFzX4AGPn7xvBiJQsCZ3U06Gh5ezGa2z1d5+j8O+SypdOXjPSp9NIPM2XQsNZJ+BDLojH3BF2BgrXm/UZZ1SwehmoS+4p+vjnDW0nHeGMW8A/g9Soww/iT/6508aC77mEVHaZ7D4rFIwJ6deBdH6MOm7eTqymozKuYqk97fBMXYmuYElgJL4+VxYWKH2djfCcqJNasDA+BCR6tRqyeM75VoaQ7XulY8Bzk0vuC/p46IznBSfp2qS31SCGXjKnw+cxnlh1SKGfljYGrQZgDzcg9Sn+vibtC0JvoLMwaDJBUB7yuQHWlc/S4C9FT8fe+GBL4hCGgWlMJndEwZHFsnA2e9eqyh2oShFAvXKp2YyvTMhAr5HQDa3fpaQs4qVdcwmjYzCVuL10aNCIlMOej6cH9rPhwUD64wzQQdjNgZEmGorrDC3LpkOUm4uv4kQh363qu8dK4edHyEBkrnxx6BhQWQPo2+6s8CA11sD2JHQJo5LCUs6nMusWxCaZHfhn2AA5Pijmw7T71/BnGedakIX2VL3rdvX7PRbnsjcyKwEin1sfaFEBJ/BMFrFiHZ0lKaUmVuiGA1GwY1tTgrAO5p1uFu5crhBaTY75Ial03iRhWeZxEf+FOpEHtoChcD284T1DXkKGTgX+dTp/IWvRARtXCmaYwuIFeOF2ZCmvK93h X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:993KQJaXtHwgufoX3/ScO7Q8JhzrR7GKB8/L4wsml?= =?us-ascii?Q?E9wZsTcEVpnINDhqYbsFn3PKwNAuk5hK9EhK4eM/D7oyK5xC3lg0OkszI8PV?= =?us-ascii?Q?/YwYc5oNb5JorY7NrqP857cQd9iz3CH5LZC2MSAdXULwznf/lwb9mBdTQL9Z?= =?us-ascii?Q?mFdcyhJUnX2Ec0EpslUX2ACIERzkHVbCrw0Q1hcByZv9W2liV4GGmnGA1fPU?= =?us-ascii?Q?3f4lVTaf7d/jX9LxNUQsaWm920GZJDbI7dq4uyCZlVw/BPDEitHVdPA/2nMe?= =?us-ascii?Q?bO8x8sLQdnhC9eG5Nyk31xdDeOaNoeow/vXhQx3Jnjrt6/sJkh3qyo/aeGwO?= =?us-ascii?Q?CiWmVfHJemJLBxw2rJkMZ8FbjDBMM5CCVdIRNRreqraod1legtXIMeOovUE3?= =?us-ascii?Q?wVQZnayFB/Ys/9t1+7n4MA2VEkNQHymo+/YRPbMy1jLFt/T+NkG61glK6U9P?= =?us-ascii?Q?AgF+0EoFPt+3zTWnfvb5f6L7Zxs5UDVULMp9NPic9Y1WLnVn48DYKWYcb/SU?= =?us-ascii?Q?o55Uam0uaJYT8wZEGvNeDlJMPIOUfOAOf+6JX1AxM3igex0GA3aJibkLLaOm?= =?us-ascii?Q?79fk7ZWrZ4wbaDjm7QfBKf6uXmjrbqGqRvhRBZKZi2IcJncUEQVmGXAYslqN?= =?us-ascii?Q?omLuxfQ422lPepcwC3m8K3578e7JLcT74gsmw5G9VQtZe1SuK6CYMhhZRq9Y?= =?us-ascii?Q?l4A8yLauraEAllnVnKtWF2B5chG39q9FhkhrCqsBDSahT3YEIkk5ZfUHwteR?= =?us-ascii?Q?U7OQLn7iBNFsipiF38SyRoh+UORNGjrvOOu/yzKy/Vf5jgEjTqXksK0lQaC7?= =?us-ascii?Q?3jKgNzrsv/NPNP3sWGJK9l28NWFZvQPHZQ0lv/zNFifgpYWZySrnR1EEBcoF?= =?us-ascii?Q?LUFBYnUcjQQ+FEBs7Qlresq0kRE/GASEeW6mFuMO7/yG0ew0I+qj89ovZy8P?= =?us-ascii?Q?8F1tDZrH4J2bUsaxbTWu5XG/EBcRnjJyXFDZPrldC5jGW/aBBrWL+z/sR2+N?= =?us-ascii?Q?Ldj8O+xrdIhIK4Pzo44ij4vs9UA0fEh7jeANqVLs6UK7B3NLUHfDmfijqhzl?= =?us-ascii?Q?rcVj5E=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:/TaEomH+MYr/Qj+BZhdtsHpZiVwWVXtOP80yZokJ2ZYmazJ2M5B48tw0CpbEmNCI/rMc3aOi5esMCtS0zOTG7+Z1skG170ffz+V3g1tU0sU7pRmjigKv0wdU6lzhEhWbtkVGexJxPejg53xvEKxyEDrIxodZivLg9IUrQTLH3hFBbHHHnZyZBJBBXeVZWges1K0RHt0hPvkUXRB7T+9cY0lsZq4W1DK821Fcl816r40PtLk1dVrvDwGmKbwdLjlaSvm3r87sJWLLtzrag39DlM5N4QRds0F8j+0B/zSfg4Rs6pVqXe4AJDbC5YOZ+A0ck1/PoTFk8jamYs80yoLUAmsG8pLqfDe6wuajMkR+WYwCw7KWIn43DuwgXb+nlQi2STXaKBJaX2J93jWG259S2YuOQaYMgyjZp8LQD2Ilin0UeSSHI3Gp0HCoPjky/3afGmnYxkllUe5st3uxdY+LMCjgFG65k9y91pqODqtLR8801lQgdgQxJ3/3QrBVIknh72yPPWNh++cqx2Qk0WnIURo6V+oni6WbZA43GPX33O8=; 5:hYRw0RFCHMYPlXIxOnqLew97GvhHkq33ujJVSNkPUYSM2BDL+rSxw72jJT1WO+N+TzqY2NNNZIpXQmPLtUaCuGawh3tl/xHkk/P0jwieHqllU42Qj3jVZtzHH6HjskAMURnTDXJoVSO2D3kerogUwA==; 24:/aqZ7hA8Wzf103mfc0KrfeK0JwOMU2M3mAlISB++q6YPwzgB5cS+eTQcjUApWKmPk3lQtoCUxTnrSwkJkLKYxNE424b+ANrLfdCkqHCUujs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:loXRbqUsb5j5Q7wEp5UWZ5f1US74AxgTIF5UYpMciBAybuyrqOBPmGq0cy1zd5sunOg8mRDwhHcZPbHAaHMBnnB+nA0sZG4VorQt8fitB8A0tmtIqqVhL3gCcw/UPICRbKpW+3ZH/GSn3j+WMhSKlL6XYMDt0/w6FqDYOhzjX8yWuIpxkwdmlcVNwCRlRJ+9o54lGUePSBg5amqA9Tls779Z4B9kgOABCPtcI01h90pqIcQjZPm/WxTBJgT/tvV9tZBlj7Qo+SJAKmgBPh9D7GEE962lp9PVtQoWk9Xyjd0faYgUkY6KpPx3HaP7INWGw46aSNKK+dwHpUK7eoMQFQ==; 20:xbLTA+Rhg2ScIhJuJqU3FwakrOLxv29QWfbHNQP+2StGNhSMhMpp5PnxxWknYvgqChe8sspji3w0WVCsVgqYPXRGlMfz0VX64Y/3NXfRy+GFfHAtVA/vHbfjUVUPoxm6k0Fkxgz0SCKRGcRW2u5Fp1genCPZxla4JyQLuK+xubQ6QUlSVggDUiH4hDt/Szx3PSywQ9rI8+gwQHeiXvBhW88RzSR0jsh5H5q5orCibml5y1HfpFhOhyHG32DQYaHG X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:47.4391 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 07/13] OvmfPkg/QemuFwCfgLib: Provide Pei and Dxe specific library X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Current QemuFwCfgLib.inf is used in both Pei and Dxe phases. Add Pei and Dxe inf file to provide a seperate QemuFwCfgLib instances for Pei and Dxe phases. Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 3= ++- OvmfPkg/OvmfPkgIa32X64.dsc | 3= ++- OvmfPkg/OvmfPkgX64.dsc | 3= ++- OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgLib.inf =3D> QemuFwCfgDxeLib.inf} |= 6 +++--- OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgLib.inf =3D> QemuFwCfgPeiLib.inf} |= 6 +++--- OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgPeiDxe.c =3D> QemuFwCfgDxe.c} |= 0 OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgPeiDxe.c =3D> QemuFwCfgPei.c} |= 0 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 139d54aa010e..cde3d43e39a9 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -140,7 +140,7 @@ [LibraryClasses] DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVar= iablesLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf @@ -257,6 +257,7 @@ [LibraryClasses.common.PEIM] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf =20 [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index ee6f98d68b73..8aa72718d065 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -145,7 +145,7 @@ [LibraryClasses] DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVar= iablesLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf @@ -262,6 +262,7 @@ [LibraryClasses.common.PEIM] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf =20 [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index b5f26e06e60b..963d394662ab 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -145,7 +145,7 @@ [LibraryClasses] DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVar= iablesLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevL= ib.inf @@ -262,6 +262,7 @@ [LibraryClasses.common.PEIM] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf =20 [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Librar= y/QemuFwCfgLib/QemuFwCfgDxeLib.inf similarity index 83% copy from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf copy to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf index 689476032d39..346bb881ffc1 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf @@ -19,10 +19,10 @@ [Defines] INF_VERSION =3D 0x00010005 BASE_NAME =3D QemuFwCfgLib - FILE_GUID =3D fdd53716-31e1-4acc-9007-8bd5d877c96f + FILE_GUID =3D 80474090-55e7-4c28-b25c-9f236ba41f28 MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D QemuFwCfgLib|PEIM DXE_DRIVER DXE_RUNT= IME_DRIVER DXE_SMM_DRIVER + LIBRARY_CLASS =3D QemuFwCfgLib|DXE_DRIVER DXE_RUNTIME_D= RIVER DXE_SMM_DRIVER =20 CONSTRUCTOR =3D QemuFwCfgInitialize =20 @@ -35,7 +35,7 @@ [Defines] [Sources] QemuFwCfgLibInternal.h QemuFwCfgLib.c - QemuFwCfgPeiDxe.c + QemuFwCfgDxe.c =20 [Packages] MdePkg/MdePkg.dec diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Librar= y/QemuFwCfgLib/QemuFwCfgPeiLib.inf similarity index 83% rename from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf index 689476032d39..4f966a85088a 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf @@ -19,10 +19,10 @@ [Defines] INF_VERSION =3D 0x00010005 BASE_NAME =3D QemuFwCfgLib - FILE_GUID =3D fdd53716-31e1-4acc-9007-8bd5d877c96f + FILE_GUID =3D ddd4f5f0-5304-42a8-9efa-d14bf11a3533 MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D QemuFwCfgLib|PEIM DXE_DRIVER DXE_RUNT= IME_DRIVER DXE_SMM_DRIVER + LIBRARY_CLASS =3D QemuFwCfgLib|PEIM =20 CONSTRUCTOR =3D QemuFwCfgInitialize =20 @@ -35,7 +35,7 @@ [Defines] [Sources] QemuFwCfgLibInternal.h QemuFwCfgLib.c - QemuFwCfgPeiDxe.c + QemuFwCfgPei.c =20 [Packages] MdePkg/MdePkg.dec diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c b/OvmfPkg/Libra= ry/QemuFwCfgLib/QemuFwCfgDxe.c similarity index 100% copy from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c copy to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c b/OvmfPkg/Libra= ry/QemuFwCfgLib/QemuFwCfgPei.c similarity index 100% rename from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454208375191.21703377544577; Wed, 10 May 2017 15:10:08 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9705621A16E35; Wed, 10 May 2017 15:09:52 -0700 (PDT) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0601.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4a::601]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2490021A16E2A for ; Wed, 10 May 2017 15:09:50 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:48 +0000 X-Original-To: edk2-devel@lists.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=HI+MUqDbZKSIjNnAoDkMS5KYvnN1cBFir4XQZiiq08o=; b=q3qFBuWlj3qT5B03u2ci0fIc9RIN4V4GT/SN1K5Q15cRiNrDbzXzAtX/S5UlK4lKbFk7GohS0Lt8Mnk8K2xOWBKZkeC83kGdZijSwwtY0sPTD61Iz5yQ7ylC5NF4qD1l+QqDmMslioVnUJhJDmSijPn5l4V9UYO5/wpL0S0AuJA= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:17 -0400 Message-ID: <1494454162-9940-9-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f4cba5ea-428c-4390-5d69-08d497f1466e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:VUhUSEqNwvsV+Hb178HKwyLR9oPF7nIt294RaABKO43bVMoWSbiHA8JU+XnWunfdgZLkXpNfT0Kv7NjAo+r6UH+rjcI3XbY99AZRGeUUA7x7iCKa4XhuYnk2laRIIMOithhXc+L5xwAj7tpYiIz3bqEo78nTStuZ4GPXcpmm5X1GcDjn8opOsVJOQJPVpursT00rzWxv80bXpRcUaETdCEnUxAccqKdi+ej0s/s+fMDxerB9gMTI5oRzj5JtTGnJ+2HknP8B2rBF03W5bG6BxhrZz7rGwTTN/cFGtx2zk+Hqao0QM6dmjkeIqLGE1+Lmnq51vLtoOzeB/FJXBOYw8aHuK74kNOg8v4NBYxZC5tI=; 25:7Ycyn/MbutVfy4mZGrLtl3PQrZKv6XDZAETrP2z+jr7Bn6CngDM0dZcmq5s/FfEmgcGk2J4BotUitS1uy6JvjcNDmdNFNYu72D9/LEMs/wn/AC7sPCLuL1yvcRTb8wxhUfrejtEGdvZknOw8xruLX11XwNHRBWjCJz/86UyFPw++8eq1p8WGNK1T/UQuyLp+j+JdKbjDo021qqCnEr1LVP80qnjJIh0qpNGVObrGc1l+zIir5qtGNqSEtZKr1F3fblTFn6xwxmwtAnMYs2Gh/LzKybR5euk/4+GKjnIr7bCy8nPS1gHa64PekRp683+BJLHmeJzIEisK90Q6+YfkhS7Arnhz61mVjF/2WdJUKa/aYFEOJ5YRGcx2ds3POPlk5pT8WRhJJnYDsNmyAz52evwwkgdLPg2vZj22RM6QdmSO2+LZTDsRxHe7cpaKx9Z8SMfqQ5nAD8kY44aufI/F7lWCAXLbCda819SocuIc2yg= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:Mht21lU9IrVoY+5SIp6y6TDTg8sUmfrcOhID1Bhi1GgpQn2UlKBWFBUx3dXaN81Ab6zpbulmB0MnY+eCOWZmBr6yzO2k0fN/wWhliVn3hnIBW1HoqlR1+qd6WZObBJ6g02SCnlY5Xx9GO6UWW9rSST0o2W2VQbGlapjlkdkujIa3QaAOs7FWMy+Sa5ymEH3pHspMQDAVFZBvf/jVhrsKI9k6bb/MM1keD7v1QHHGTCY=; 20:jZJNMb/gIYAI6MXscONOVmVe29DwGaknhsToP7KU0l1G1Jf3AJmHQXPsOn8qGVOvfIAdm5Vz0Hlh4xUe1Ao9NJ7805rFRfwKMG1NlqXru1qtRuYf6asygV7yuFMv4pS6bzGQ+VAYi+BGxzm63JNswx4SDp7DsDB7aMJQLeuJZ/6+pSf1K8Z7aXDPN193tnySC3tMFTsFobweiuQvGGhKnlE7SuS7k/cRpANORxoyjg/e484gW4E55AHHJP8vQMc+xMik+ZdbhI5ugTLRQyYZ61hnmkIIySYe5vppHtDFUampi3VNiMBEgECM9Ah25inmLusGbqJDQDBWbKUtf42JuTH+uxMW2HDXLAm1Xpou9S9SDKEWiFF+bUhun+jtOEUzmaxLHEuplIkxINUizOlwEl8jd0KlSRxUFic546bRRYvNu580Nsn7QGkKO65VyWoRlqJ1ZVgLN3mdE7KztdvGXrfQjfV9s3dCIX7uoIcmjNICmGnANonpdHWlfD/v3hqS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:x7C4gVPHXWg5iYV9R+KhXptC5OV3SpZfqL72IGqAMge8nr9mw/LrW5Kc07OtTJJxAVDuKl+pWwUSZkSzvZ1g48hinyYGtGRmiy+DwbKLeHt9bochwqQBgFlVeoEK8tXgtwHcRQfqStDHGpP8pryi9LvQQD8miOCyKL8OZKBZ5LiUKgr4k8m6BjhXZh+oIIzWxxHbOgFNJhiXqwsi/joFAgZcnMoil6EufaDKKR0mXlhIva8Vz/Wh0u3cMinQkHeY5i3/1Z44wIJNmpS1SfESeuJ/05GGQIwfRe34mPMV3zMMfX1c0KBMljsXWQx15e3fonW0wDxHK3DEBy63P0E1NmLmFD4Psu1WH5jXDFSYYCOfQciK9mYlLp6m+Jm6U8ACPFlOFTr11z6jniEgHdTLX2RtFFDO3wW/o6qeahVc216Zk1bPerTsvUpQHtGlQEB1j6qfANW+jD20X+VDcWWqHuSP4tYFNJF8f5lxC3zwX5s1iYoYGkntNtCy8bjozOKAqmQ1jRenQBoDUp1Dz2Nm7MDR6XcIWoq8z+FILJXil1gD+4ZBwV3+mXLx7zfG9SC1AKk62LYPlJeXKbPRqWVVy0qb9tpzKjh4HwGEiuUnzMVHyIyYug/K05yTyx2iMcLqGVYZHZHQZ6jt4jQQyDMUeIYcxdvirLNFgjAKHVqhGidp+WxxWX57/6TGF7rJmCPMcXYTC3/6RE7UefFd7yzO2kF6XtLEAy3FhGmc3uIbWfl2fFmGoYOgoTpaf6QbdepMJqPQ/VHB6/xAWDiOcFbXZ/CnSNYDXOyI+U2qKO62ZS12zz55u2nEiQ9GRSg2qJx2B1nttNx/fTkI1WsqMMIp9zoaWgevblKij3i7EzrYl6IzB3OOAHXvgovGXkiRsmjV X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:9b39uBdP40h/V+YQo3lvh96nyyePJGZo5OciwIl2q?= =?us-ascii?Q?gbjgYm/N3EqAJj0tphxqypRwM/npzUhG21ejpWowO56Z0wYo23M2GD7s1AFw?= =?us-ascii?Q?pGRnVM6FjroBxBSD/Riz58nxcwyl6yPGSjnB0E78DlT1fvn9WBNQUuRUEvp1?= =?us-ascii?Q?mLJ83rrFsx3CgBi7tsXJH+KhjplUbsf119xghE55I++fpX7nby8uIjjqqGla?= =?us-ascii?Q?+np65Dmly3FC3Wbu7Y0dMv0h+f6Oyq0njVpGnJl4QQzXb6uokzvmdoY74NBE?= =?us-ascii?Q?7nr5fXFTn1GduJcN6wya20PA9H8yr4BfYoi3TLxpxcuFfsTmZzMcblWb0LuS?= =?us-ascii?Q?IxSGSdSw4/Rq3cmPOJ1807Z+M3/EMno8Oz5PTr30JJLM14k9rIfdI7zUaEZr?= =?us-ascii?Q?7Amp4r29b2JoNZUvARuiU6gmNt6MQiTM5KFbTejUiVsfUboLk42IbBxU+gDE?= =?us-ascii?Q?ZLw/GkagowYZ1q8SwXsyLRHANacd22YR86eEUrPfXgF4Tc1+n/b8rH3rO8aY?= =?us-ascii?Q?vjaEic6CA/u79ddvxr6QdBKsbyp9/9KmuyerxhM7fiDZwrgdxY+0acBPRvWf?= =?us-ascii?Q?wJ4B74LabExUIs/1Xnd59wmVjo1qwfqTMG2H28viy0+Rov52laieV9eEfSNR?= =?us-ascii?Q?MEA4g71auFsBmK7E0E4Y3hb3wnKshH3sIawZrjkmOl8W2snXrFEN/3wMxL8j?= =?us-ascii?Q?v590KQuLqrbA/RSCfqM0ga+uim8ORXXGk4AKH+pOVfqbHHfAXOfsPhbN0dqx?= =?us-ascii?Q?elomgFjmC5OeFmXFROd+zqPMML5HJdr/wo7fwDWpz/4ChQD3KCOw3vhZ7KUL?= =?us-ascii?Q?LJn7DlM1xX5TeK+fklmmhkYsoQqVfG7mnA32+60qbjFubvEUvuyDBVUQ/BIm?= =?us-ascii?Q?pEZWxlboOwhwKi34msS1u/Vk4lQKObsFsc827Svt+MiXPXmTJFYou4KDt1fS?= =?us-ascii?Q?IS234lv8i3eI9kiD4uuwtQ/01hKoDM4LuRb2HTH1u4bBTo+SeDRPBZR/hvrs?= =?us-ascii?Q?ssNYc53Pp64+SrWJP2+gLM/?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:MCzZZejaZnQzOm0pWZJXFFEjPh+snYi5TQbvO8kDdcN9IKf8mQPzkk1h49jV8CjPtcj49QYe1uTGLnGnEMmwDc8KBxqIe+k6M7RY7I0r9CGGGtM51+E0NpdnXyAQIlwi2unOQstlSBZ/skcPD+asrSfPGiZpjUlCpZpZBbFj6L1XdOF77QJoseJPxLYP3FOluhaQ91RwsyZbIH4wfzMJ9hKGMCDP5SV+fewDSMNGrT97NdpL47rOAIFRM15R6YpyJMair7aQdaFQrTAVqtE2HBkpiLM3ahfT8LLKc5o0UAgGdOKPxq270CamLDelqlLGtEKNjXonCQ3WGHQIHLf5p3n21x+FnC8f772e01qur+aVcdCuTKbatsGs0cYHq8fmhU4rftWB1/RF91OnAZtaJNrZN8lGq/p6OMDREfCVWSjZJPSrpma5pHh1jyXktjG0adPVODY1xUzu2BlZ4rqCE9rVboFR8Br+3OhwSLEBRt374AX7cZaqUffV8DrVa/mFChp0K/PEP2vaHzaAmDbCt4/VlfvRhscwgxQAXf1Jk+I=; 5:/B/gKCqEW9AB+EpJWuW4UvDyJm0SPLFRQi0cEFiYEKL96FQJssGSE9jMfNxULRs2Wv8e4DQcWHNdxpX5eqj7F+8oGul4fcWlJYIJmHw2+BChdhqSeaZ67zLzQUKIPGMpCQ+8qbXPgXC8XChoa+4kmg==; 24:twbM3fb32YRDD+0HDEXUej2YG3kTnNUayT3NBom6aMqX+8nG/fmaCOGDGUQOHkqaO7MrJ9KWqnn8KUc6ZK1IV1Y621jFc78iF3QPUVE/Dsk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:X6uiyn21CFxAT5qqjIGMeYL5BRMtfgfkBgrYha827ATgLJUsdSaQiXWg1Z8DbJJHRGKtinawDMKsJLhNo2tgEU52X0PQhpykjCHOBboKAFSd0I+5r4BuTUKNxWJhJ4m7mYI4A+tG0/YZpIAGu3SBvcqUP5B9z5FzMrkcgOchnQmtad+Z5qsWG69vZohgtMjB48HQYRCfUQYo6Mj6pfyH/lXKgvvGNMvyTP6XYSXnurW1S44CQgFeS0m2o1JVrJZrZ7S989CzKQzdoeryyugDYfvmBtKzCaR6P/6kCy5D5zJU20kq+Jat3AMa9vsmfSkgGNUEwyXLNFI0yh71wyP0mA==; 20:EOvoqO64FEcnc/kpER/v9bfM60I932ZaF3Trr0hIyz4z2jyngK2FL4BZASkUI4xIl7ECBRj5fvikztr5vM52Fn4cbW5u66eQSStPj6OPeu/EUUwWFYydw49f++xIf7bRRZCl/qqEokGLOaitI+MfPyjSHwQ32DS/Cui++mofyrQ2gviDysGej/ertpTz28iqapKZhDLaoxhV8S2nxKNNjaxkTvTTSCSnlOTMuwiC8uEyzeD2zu7BtpfSYpAyadnM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:48.3898 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 08/13] OvmfPkg/QemuFwCfgLib: Prepare for SEV support X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add SEV specific internal functions which will be used while intergrating the SEV support into QemuFwCfgLib. Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibInternal.h | 36 +++++++++++++++++= +++ 1 file changed, 36 insertions(+) diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibInternal.h b/OvmfPkg/= Library/QemuFwCfgLib/QemuFwCfgLibInternal.h index 6e87c625102e..87573ff2fbe3 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibInternal.h +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibInternal.h @@ -43,4 +43,40 @@ InternalQemuFwCfgDmaIsAvailable ( VOID ); =20 +/** + Returns a boolean indicating whether SEV support is enabled + + @retval TRUE SEV is enabled + @retval FALSE SEV is disabled +**/ +BOOLEAN +InternalQemuFwCfgSevIsEnabled ( + VOID + ); + +/** + Allocate a bounce buffer for SEV DMA. + + @param[in] NumPage Number of pages. + @param[out] Buffer Allocated DMA Buffer pointer + +**/ +VOID +InternalQemuFwCfgSevDmaAllocateBuffer ( + IN UINT32 NumPages, + OUT VOID **Buffer + ); + +/** + Free the DMA buffer allocated using InternalQemuFwCfgSevDmaAllocateBuffer + + @param[in] NumPage Number of pages. + @param[in] Buffer DMA Buffer pointer + +**/ +VOID +InternalQemuFwCfgSevDmaFreeBuffer ( + IN VOID *Buffer, + IN UINT32 NumPages + ); #endif --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454211073410.9159334355927; Wed, 10 May 2017 15:10:11 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CAF9121A16E3A; Wed, 10 May 2017 15:09:52 -0700 (PDT) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on062b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4a::62b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1AE0A21A16E24 for ; Wed, 10 May 2017 15:09:51 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:49 +0000 X-Original-To: edk2-devel@lists.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=bEX8iT2eHzUsuUqs0ceUqCfs7jcjXFkrcN304SUw+DI=; b=Kyuntf7Y8lA22KGYJe5tVQ4n/VEZwhitYmk5/S9eWcz4wfDOEOyqchGAoihtbqqGoGnFniR1on9fq+1Z5BnPUkmJ+Ctvy4vYGx6NhkPh1wopo6lnmcNhRUUUXh+Y7WekkSONtx346T7STyJCc2qpTNbRDRQORRRcIoXeqisR9MQ= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:18 -0400 Message-ID: <1494454162-9940-10-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f194ccc9-dfc7-4151-9114-08d497f14701 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:hiBpDkID91j0ILL2XNYn3MOLwUcmBgZXawpNx8TAnFppPWb/TYYHLyfL2TGktsIBKSjbjvnv+CYcL6biFi13Uv4RIqTugXvpfyrVemX5LaHNdEI7L1m6RfVNlpcGX3sOi9DbUxx+w38bDDSfWWhNoLoghAmylCOyNfeU82LT+0gXOGdnk6lR/RCQALGVdoAEb5CHqAosgV03s2TuvXeyzkz3WLIXCDjHcUxykJECxBqMsKIrccR4XRnMr/T4rm60kAsMd/xISdjAT5kTRyOTkJ7C/Sd5/7qQye6FqgMxqysKR15760hxcLTd2MyQMkD/9f2XCidxbnLjbDZE6DyUdBoMrx6twjXXKh5nqXLkO1w=; 25:iBWkgsz5X9b/fN1FiZz1sV1fC3g7p8RfYc2X2YjF4F4NKBryCLGtNxnM0WYiGM64OFyjgXGCEYAX4GaDr7Tr/et+c/INhedHmMPDQsOc9pigcoVkQHvxVms+eRURsEM+fu2Olr0SqGYEGo6LXEIXcF3smFz57o5/WyqYqbJ4rgQkAPn4XKDHL9ytxD4UcqPZjJXEeaY9cti2Kc0nAZeEKHIg6kxhdmF25m5yeASPBJC4jFfohM7oXI6YTChlYQ+hcndUlsJZbHNCMSqwxZ8w8/jnMEsWHonJnD99pItt47c+ISEQemOUU6IVexWulggI4kIxhTWhthsTatPAJCJVt87LidfMxTtlAbhugoVa4IsQiYghYaGKJXwkFN2wS9+In4cTBdB+IgIWNPCsqqC4fNl5aFTr/9XT5Xic2Z1oCRoSAN7ef/5UQcNr90gZu8fWabfhDmE64RRfrNmPwC0hlbVmTRSYFR8dIL70foQn6v0= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:7glX1Tum2MaQZVqH7FaJYIxapNDKKrveWgzupqmfStgFX1F3UGyUKp7vGLI4GXmSXyltc008OpFFp+KuwOaiquXiXFMv0WAZ3TTxh4jY1WB8ekCoUZYD//1rnKSf+VlyVgOyRIP4aHNy4O0qpQHP1glmCFueyH7Rh/OEdza2woxWaznVRgIqteN++sF15hVByCyFf1Ni/KC7mYk+0/CmEw4CDetqG9qJ/Yn9v3bNDpM=; 20:34iD35JObUm1sIuAoroa3fZaphLlzFYfCDquem+rS6YCc16JzRYWsibwLmS8SoICcCdcbXkYIVD+dpDVERGSnjztmXeZaOVng7sj1bhKqvlSIrQd3dGcaPrWdB8qdQ8/SWAdz/lsMfaZ/vNdsh6Nz7pHVjNerMMfiX9dgE8h9STzUAkc9KsJ5+y+Ydajs8rAaGMRsq7Y8fQZQvnG9fF4JIUhlHalRTSHAHfY0JQNbY69XeR+XlNfbQV5SNimvRLoXqcnFjaDkIlYQlkZrX/x2FxBNwJ7Lprh7YLW2MYAnp2Y5RqIaljAvLMnwzVt31989JHNxkJ7fHLCDTyL4MIXve3b6qXpVT8MR0Nql3ospFI16HT5/45MsTw+PErnTBzCrwrcTP+fgEt9z0kN34o04/iMXQVfqU2EQPL/myGcs3xbCwxSGpau5bc4EhUTJlc+10HKJGoavePv/+XlcF2CQyYbuL076BKQHk5ICP5YmbJgdtkzWl+iJZosACKn+tY4 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:8lyMNopEUevnC95hilXjlMpsXlEFivDS9Ab3IHFXHW/jz4crg2biPD3Ot06EPnyxR3TWprSdyMvrQq/J3kgDldBzeLpCaU/ekQijFhI8mYCoxUtH05DbNlRd9E7rtNg7LfF9bfWMvXBsUm6wJJNfSe+eiCIDXTFeLMYjmWLXIuo2q6uYbkcs2cAoFxBdhbTT7cLay/MkxVh/GMbALgdEXd0JEoLD6Mu9ftrD2Jqz3cz7mKxqkjwWmOhoRDtZ8dqLPH44NzyyXhgE539jDC+ArJr/QmeQJ3cGlf7uM3vCplAuiSF/dZK7vRr92DyHaE0xXCwDBOZ1rx6kHPiovFAnqOT4wK6LeMXmcHWPVdvXUXuMHh9U4zAlesXVzGSUt9IKNlAYw17auZap/H3+Fdb31vZ38baeTGl6grIh7pWjau2w72jmARbJQf1ElctU0f3m2ciHyw2BC+zwdVXmsB1X7EY0laFWmz79pmJlTlVJ0o7tZRLvbiHiJoQytWVH0Z0zGL5A3Gw4wf+Fa1p7SQRHknXkLkFkmUjCm13DVlv+R4k43vaqgC6GYEf/sE5TEWegg0L2XlASffxdU788oQv9L3uF4092HQpTuQWErSQwsG/tfxSaAo2eiXdyWDbsOrg/VpvMUNBh4s9qDlfh5bXXuW7fm5jSS9QilXcb3ai7aHpIHnK4fyiXPBGIrUNQ2kVdHtOzpy2wGQPSwOsD+23X4zxOXkd6ICfeL9g1g3RdwaCxfSv9tP07YQsjmEOS2aO0OCifJ87WsUwR9xSQnDvPQBpt8SWdQY7iYfA8eds86lANoVsdIenippziDmSBHIYFBoxkJ3UxPy/KpD5oAXZhen3/rd++AOyis4zngD9EQypApb+JF28tPL7rfshoKIMm X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(575784001)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:EhJwLLS4SGTA1Kd6M0kTj3cvFN7J+IH5n7XAWbsAh?= =?us-ascii?Q?G2iSQhrSQTetMRvCMB6KqNSn4I6EsdojGnLcI4B2VbN69TM+wUF7FpXuodlg?= =?us-ascii?Q?k8Z57XafhokfX3tx9ZysVPOLUdV+V+cstbChHEPZDt5AUjc7KdTJD6kD/u3z?= =?us-ascii?Q?FJQkILgzi2zKQi6HXwyZBDw3l6tFQrLK13RD5vDDadw1OV0dYHkenV+52x/W?= =?us-ascii?Q?n/OmJG6cPviGwGj1S5DNfvaUrHaryvk++L45RJpYfrF8jRdkaAO7quUOUhQC?= =?us-ascii?Q?Dgh59d7kqYcF8xEQsdaZRBb4y5O1gXWaQnW2LmbUXqdAuff2/CF2IWUsMV55?= =?us-ascii?Q?htx+v+Rw41iWOzjkyhiuCgJQk1fvSXww1jjBqkQ0w2PhhqBoVlwX0nqUv763?= =?us-ascii?Q?2xmxrBeUTPPEHWfB75Klq2ZD+y/8jmNVA35QENPIrrKK6IEGF+0oqH7RgKjd?= =?us-ascii?Q?x65XaetGKpTe0DOA5y/rTkTMIAQE90gXaxdkF1cyaNBb9i8FOre2TViM2sCl?= =?us-ascii?Q?0DdnTaAFvB6lVANDyMGMK2R49mOwmw/5XozG82xsZ568kw9/ojRBNdNHLIEq?= =?us-ascii?Q?sLtQ0GzZVzD/Ivz270/hgzhaPznODO41MkQ0+8A9BFPtHnAzGWRNy70whuLn?= =?us-ascii?Q?A/EpSNZetgTq+JFPAmIofWWnoEjvg/fY1STH+/8vhynahGjA0uFBnZkuJ5Di?= =?us-ascii?Q?+pNzkQPyxqxNeGqwUPssD8qyXjcK19/kVWcBW9MH3aFoEzzEgZX6WtO1zS1G?= =?us-ascii?Q?Og/8q3X9DYnoccYTS4ioon8KLHTeCSsMZh7OZaclpZ53YjWxAgo+QRhCH/2J?= =?us-ascii?Q?zsuLrQtqiSA6mPji4EVO7qzp7Cu3MRpKrW4gynVdUkrmavgWJ+L5jMmm/3it?= =?us-ascii?Q?OAaa2PiNva5K7XCHzE2MR3q91xkpimj4KjsYlL2igUqnl33qkNgPH1lWSTsx?= =?us-ascii?Q?VzaW9AnfmNl+b2yqE7ivGMHAXGwfBMq3vgCP7lD4D6ia2m2sXJFB/X0pKRyi?= =?us-ascii?Q?i5qgZD0ynYOQAMe0RAeSgMOcvZ2qNwk8evJWi0ZJXDwvgdDa7gqTPCw/EttR?= =?us-ascii?Q?D51ML4=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:/SdQinT38o+aI6fUoRoNbFCNXA6TXGyFWclg0ilSWOlK8/be4N/AcQ7hXweAEgD1kljG28Lg+TTnbY2tRwBI34f0lA+/y4fPpYBoG+4NKrOWK2c8nMFkhsPS1rjaj6d0i1qebvz+CihHWnrTAMGLvfuGu03fOeRbGlUsjq1SRN+BXoApUpvATJnoFmSxJyVR0kC9oYRRyam9GAbx3Z2kQfkL2MS+m/UmHqPShsA40om840EwuiY0pZ39WBKk9e4wrhy6k384q14vRUY18oWA2BtX1LDhaaMDVYANwT64vTXsQTbjRfxcsHamMJaG77K5+o9+m1pYSmzq808KvscbNZ6bIXsCVRo0zMv7CYDnqWeoeJErzkktAyFaBigdEZ9uM2seUqYxlS5JZ5W7jh7GXUzxxpgBm15XlE2a0r2wtn0/1mY/kliXTgAJr4+fnC/kKaRAQ39ohWRmXXX+qMrz/p4zkkr2/Tc2YxmCBxNbLLvTAKJ4TwbKSLBppBL291NIGifapDY8xGaU8CZ81s1nQKWqLbyP7LVq2BJP3PZd7uI=; 5:1K+GRpRJ2pDfvcNYkGJdw4gqBvVkDSlykAQ1dSkFzqSsMqkI+ZxQj8fDXyMqJF2ctDC3AUX0yUzMvyIpom1c4PGP97sboHu3npLZiYG+sCmYNPpOcU9gFp2hGpYWI1nv5QLQzMckJoOyNME5jz5Gug==; 24:z2n9e4XYYmDcAR0/aXR4HaHwUVyB2QgGCFmS432PXiLOklFN+pbjAMKrZ3gp1SWC9oYVBnCPq+EaSRwozfWenxUxqtK+3Pr0ZXJnKnTlu4s= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:OP687xHZDAjV1LPfvkA2bFtwtvUELutqXZpAJrAbGbdz+WlyHYgaD/SgU786re6Zhim5HYqYA0PRMJyzuC7LDQIkKo2mAXUEjqIfHW/43eV6rZysqGsi0ZMpjwYBJOb/q450yEo+Jp9EKLNP5qa5e6LS0Qscdux9+CV6TNMObhpeSbONRGjJ6azQX9qQEZYYpBYQgdt5Wek3PLzKBI36ulqUzsBejrbY3rA7MeSCt2eiYDD5qaflJQDUi9G4maKR0/C3cS2nax1Bggk0PHwYvmQX12x40thIkc+CzP0ddnYbh84nAdM1l+KJO18Ci7tmKY98XLFj3f+sqWHfD6RBJA==; 20:vg4mhW7CwiKzsIj27fs3FJUOxktIvcOPPyDIHYMiA1PgKN5doL6oCET084F/EtYctgaNV+eVFnErI+nn8QlFz5uf+Aq3gd0Y/0W5EUgkwfZeeDQVL9eU0FIWYl3O0OTwSWUT9eXrFGzIMptxvq8PqKTEWwTnil8tWSSUEcixqo2nxRn0/2CYR/ERc4kTjXWQKLJDPq7jxyObN+7lfOCoa6sJlKYl45U56//Fe9dOmgqlXPTYSZKK9YKPoyid2fab X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:49.3545 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 09/13] OvmfPkg/QemuFwCfgLib: Implement SEV internal function for SEC phase X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh --- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf | 1 + OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c | 57 ++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf b/OvmfPkg/Lib= rary/QemuFwCfgLib/QemuFwCfgSecLib.inf index 7a96575d1851..b782ac6c0aa2 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf @@ -45,4 +45,5 @@ [LibraryClasses] DebugLib IoLib MemoryAllocationLib + MemEncryptSevLib =20 diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgSec.c index 465ccbe90dad..cd04cc814063 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c @@ -6,6 +6,7 @@ =20 Copyright (C) 2013, Red Hat, Inc. Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.
+ Copyright (c) 2017, Advanced Micro Devices. All rights reserved.
=20 This program and the accompanying materials are licensed and made availa= ble under the terms and conditions of the BSD License which accompanies this @@ -18,6 +19,7 @@ =20 #include #include +#include =20 #include "QemuFwCfgLibInternal.h" =20 @@ -94,3 +96,58 @@ InternalQemuFwCfgDmaIsAvailable ( { return FALSE; } + +/** + + Returns a boolean indicating whether SEV is enabled + + @retval TRUE SEV is enabled + @retval FALSE SEV is disabled +**/ +BOOLEAN +InternalQemuFwCfgSevIsEnabled ( + VOID + ) +{ + return MemEncryptSevIsEnabled (); +} + +/** + Allocate a bounce buffer for SEV DMA. + + @param[in] NumPage Number of pages. + @param[out] Buffer Allocated DMA Buffer pointer + +**/ +VOID +InternalQemuFwCfgSevDmaAllocateBuffer ( + IN UINT32 NumPages, + OUT VOID **Buffer + ) +{ + // + // We should never reach here + // + ASSERT (FALSE); + CpuDeadLoop (); +} + +/** + Free the DMA buffer allocated using InternalQemuFwCfgSevDmaAllocateBuffer + + @param[in] NumPage Number of pages. + @param[in] Buffer DMA Buffer pointer + +**/ +VOID +InternalQemuFwCfgSevDmaFreeBuffer ( + IN VOID *Buffer, + IN UINT32 NumPages + ) +{ + // + // We should never reach here + // + ASSERT (FALSE); + CpuDeadLoop (); +} --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454213786806.835931909508; Wed, 10 May 2017 15:10:13 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 12B5621A16E3D; Wed, 10 May 2017 15:09:54 -0700 (PDT) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on061f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4a::61f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DB8C021A16E33 for ; Wed, 10 May 2017 15:09:51 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:50 +0000 X-Original-To: edk2-devel@lists.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=8jXJFNUtc8Sbd3Ccvk2AnbY5hOHb8g9LZneYWcqHf+c=; b=Je/rs1dSpRce3P/hHwcwaAXWftw6t9jM1xlsSnHch4bAqsYpuIj1q+Fku0Wzty5w7+kZiwzMv68FBE5qtDYDgsmrOKz0AwbdY0ntZOOhJhw0LOlWGtCaeb01mRH8sXejFy/lQnEfBIFRlwxXqHGojSLH0x5C9zpBUocb9DZCjO4= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:19 -0400 Message-ID: <1494454162-9940-11-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6e556cb-6636-4291-2868-08d497f14794 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:UUPtX7ZX6Y+i8cIGAiGnjQj9GQF2M+4zGKvIA4qwEKgdk7/bSbljl+LaMyiDiNj9Q59YsoMbneVtvOQUQ/t1ivqPacW/tpiL0B9Ie0/zaZvZRW/7YdqU3cbFeJIZ/aXel54Qb+gPsotY6tLajWqmQBrMKcrYUnVNFMC9ZEpiMZ2Av8acnmGi3ihdNldpiL3W+753RSmr8RQYVCDnvXStwSra2G1HPSu9Wc0QYBpvu/nYhqfzcQFiUa84CDI094woQ18V1WI8BM0Mw5ElXwlP5aJ7NZTSOAysBLEVbDGYjQjkdw8G/C6E3Enfba29eHtrmOyQqXMb6nxr74vikdn1hOijfc4ELbEU2vE6FvljfyQ=; 25:f7n9xObKSw5xwVSY+ocw6E2wJ4M/71vyGr0Hb78zVt8vNktO2PD9+HpFXX4q3QQidSnf4ewIeh5pykBE0SZSrYAcuB4aSbp896psikOdoPCn55VPJ4Jdz2F/0rtoBOKYp5sH9tFngvuFS98vkwq25nSKm6VnHj3AfXAPllndHPG3xnGnF9cGkHIc6IAqjLVSry4/l5fOP5NgXPvyIfjGyzRQH0UTQ8xuCV1m7S40LSldbZmkyVRhkI3BLLKo/C+mpKktJCuGwiWxI0a4SW3JWC1MwJw4h9R0CpqS41mP6dUvZYIjUQklLPtEo3M+wGXXc+iX6QVm9Rbe+WWBz6A0pROWM1reSh7vZGC/D5CcSvE9Z31cd9nBL5+/f3+0jasuvCwysRQNVn0c48NxLsKZldBmqD04CqhBZ4BzHu5JKZhJuXu+VwZ3g4hBrLfWl+N2VNsLH+zk6bZdqXfOI/YbB036LOCfz+WBgMBiooHt4Wg= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:sKm+WTV3s8NHkj9Iy8S6J9/i5VDOdXL7xiMPgIJueodO94D2BssmUJzgT4al6tRJPAI/6G7NLw8fw0xdkL3BjxA9zEqnq40dLCSwClEFipqrIIWXjPYhtj5a6wPFKVAfXbFpXUT49/qvPtPTkvG5pFoDrdr/Xu7D+WrVCV3MGJ/uNdLj8JVNDZuXHHtFK/5uiL5VBYqTfkBzIr8goWJ23erENWh9tKp0l8rkZe7MWg4=; 20:z22WcKA3f7odIhUzC6OWzFqzeuyELExDo6iF9ypVrxdzcumgFVu7vh1AU76TO6BmML6H7XsbJQQ38gLdfiZk0v8gaIRvSC6ThqTaA81A7T3sFKSy79Xqfa6ByUKTXEcSH5ij6/G0JDcA/vWs2lU5sIMeMu+w6nqFjTnhNuBlFCNISjX5WkZVed0lRHK5+mMoku20Hg1B25x2GlaHhbFc0zRukF3QMwD96+EhVl3wFIkv4pyhGuZgLBoXjTmK79evZ71cU2QBOLFn1d3/VnIVyTj35Y5SrJ1kbAN3OS77u9e2xWgcZHDybT9+aisVtJYPFjDdLHO9XbtKV9v7utCN7X7NXYurtfB0oTXJ9IHfClW01DCw3t1Yx7bjl5ZUF/K0k3k9owbRJsMXPEp87v5CpOQSTf/hZyhBhTVHgmAj2VqHBrIk66Ral2e4G2FKu5MFr0gGnIJgULZqSeV/8Vt26g9yMzGPdEfRPvGUYycexip3As8tyRY7sshpR77eifOG X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:+w3zTzON+Tdh11+zU9cNNGcZIZ5t3N1ZRkvEOlh4oNlqdcxWiGcWgWkpKSWsSwswlvhsiDY1KRQ2T5HSl53a60fcwuIgZvY8H3tM0nzAvQdlT20we3hLPYBIZYI7QCXrz8Cn1TUkjcVx/0vJ3nZ+igc6vk8SPotspRCBy230LgNbpAHkB3t+TpTr6pW+VwyREymjJMK3p13tP3seXNAxUDePCIbBGpI54rcsllLPJWMiHZKgI9AlA4EyHen9R0b6nwS3XwhMKcFB9uAmniqbvRUtPC0FL7EmPkat8mLoocDK2SPLItelnQmM0T+qC6cfvqrw3ZLtpOWr2x1JuVzO19UIm+dGKHYrznxGX3qaw7lCoPUvoE8ulhzMABEEnjtrDh0Btn4Xr+tifkJGW1+e8LpbzLY2koZNrRmYEsSS5C13B0IQ4npa4M7ESrE33pIFgpuUeUUR9xeer0H5fETllYuZHpzB8MykGmjV0ry84m07clFq5KKTD61uUty5CgKGIP1iMokLYP9jsykylGj6WNomxVuU7+s7jgBZjJk92PXjv87lcp78s6B7LH6og1OnSDb0yOnBps1vLp/P4ZT7X1P3njLDoVyUaWlZvm3fcBm3S9PKYj2PMjJ2eiBkuiA9/CMfNwht/hGaGWZw2019kVHE77CyyRgJ88ve+30fvPeRb1R9wABhlM43ZuPmbGP1I9uOJmqQxiM1z0fM8+qK6SwUd5XOhcO1lGt5TE2m79Bhfyj5Yjx0W/wtUb0cIHldsSQ0j0bjntHKiS9IrShDHKmux9IC0N068cqBWMbI7bvKsuhsyItBKUbO5AVp2NZu2KBVvDh1XtMzhoMLCQUC9PtZfcjPuhZNrOLrfVvH+5sR/DAqzZarOyr2OpaemY1G X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:IljyKaVF8gNXoRoqe63MjbG6fomy0gKamZkJKPC1t?= =?us-ascii?Q?wroof6vJIJ3ChPxES2SqdGu9VxCuGXhF7itPP89vEBC2V3HU2kZ0RaWdyVB3?= =?us-ascii?Q?XukJKBxqa5kJgBDrlJiviosakJ/toZSVt0r1VWJ8jqJhGL9OJEyuj+h6Hoj+?= =?us-ascii?Q?HPYxxm7dRAeKuL9D42QscNw4TSDpsgAGvIcIXYCr0sOumoUVCDA0DYWvhsfE?= =?us-ascii?Q?cidEXQGVrN/cUTCXIfPNY8NXdQjGY2DFuctIYn9i2JBedZwQ64gEBidHMrgV?= =?us-ascii?Q?5HawAZhOP8aVJeOYVKN1Ae9VEAVZxUk8KVSU2WDzp77bShd9+C+2hPkkMlrZ?= =?us-ascii?Q?sfu29YkS0m13GDa1YkRkF63Zf9Ut6MGgFZ2ALaCRicGRYNwwxrmp+YKtr6H3?= =?us-ascii?Q?GEtcYnpEjsOuOputTnTzuQcUA6X0lbDxXjpv/B+nhF+7rQVDWDaUQkowmBRO?= =?us-ascii?Q?lSScH1dcuZ7k3zfDhZLqi99bTstdpgdyo51niwV84kPfUq2jBNf/rdxUN8W1?= =?us-ascii?Q?iD+aiCs6hegLSsofluaY4ThRq4ODL3JKPcCmhE0ONnezmWaiqA5zgunwuKLh?= =?us-ascii?Q?bQ88xkIxfB7Nue15oRcTi+V3FqWWKPYnq3UF4Q7f5WxuH62hv1G0esLI275a?= =?us-ascii?Q?XNXwyxpndYdFwep1qaSmcCYDWX/OjYstCq0Sl4Popsixbw2MupP9l97ts5T/?= =?us-ascii?Q?nbMXnd97KUfdPrlKVH0eTcpl29v26O/7mgFGRLRpPIZG392QBSX0Cy7E0rf/?= =?us-ascii?Q?iebITl/4CGj9pcQfzVFC87tJJ8mcl/mHruWEF4ftu9Csaa1u0WFHpl37dfGP?= =?us-ascii?Q?hqzcirEV6FRiL+kFvT6FnVD9aUrxFEs7oYWrKX2JHuke9PGG1YcUj6JxGQZi?= =?us-ascii?Q?voglRoX43IpeVKXDORkRgkymp6HMu/M6/d8K9zP+K2v1t7uxlZme/OTS7tle?= =?us-ascii?Q?2pa6C4MKO45B9ft8/mvonXB7Sl/vPrUonHuZS9H5L54zhIO4M8OX9+Zdh30o?= =?us-ascii?Q?GXpO4ls2Ea9O9oAF1CCJk0g?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:Ovejiy8sn+nLwxEufvcCyBNT7x1jdmgPJbHfEJRc742+0nUlwtM5+q3qXwJwy7i6Cv2j+9pa9qusH+lzSlX/mrrCOYmkNMpg2RWnxRl8I/Pq9gOI+OJWJdlu+MudZA3n0m1fF9VKQOZso29xM3257BnIqYgH42usDJB9uDbrKKlZ/dtSzGpr+oVSavTSdb9FA3OyK4dEh0N+oGgbjFDkla67fTBIHoaKVY1+y/xs0/FrbLwgyIfSkVx3/IZD8aaLVWmX5nE7RNsORSH6dtZEApmtSt2Frsg84SiIrescCxEhv3C8htHJq2FvKjRJR4nYeiDrBF5fsWkI0ATnUj9vwORmbbduVEkpTvL9D2n6ETg4ShfzXfviTEbzfaSLFZ/RKsYVvkR6/WbtOP9TxCOkOwPtfbLhLgny1ak0s+ei80gpehyebQJ3ukj5HungmYjYIMal0vLGAY5TVe7o5MoKrgyGC3XyuEYENwnG4sI1LGYc/okdv3iPRokeqjdQfcUTq7ZfMRmL2N3fYwlfcw9r6piyty0ucDc37U0H/zEYw0E=; 5:7ekXLnzf/8xGN4kg0nPZeaJO4O+l/1bqZUx4tkVI+46rzrwC3kE7zbSNUSNrXz4KrYEqvU2Fiwsw09PlApU5u86+t5VPYO5yjAvGd/0qneLi5N6UJpXsVw2kRwDGaW/I6+J9FIcpvW19bLtvZASCWQ==; 24:NYFbXi+NSWqKAeft9RnoRM+uqsDMfnGiFpw331b2ZGV96nHubt6fQuS+3zg0P03Q8nwxxiHGMK/Ab1XgKjgRbjucW5fDnqa/RFDL2Wr0RfQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:IBQR8h4r/SRMb44WxlL4dWSM0rrGsEO8cp1BVVfw/ySstCHepXrS8oUxf80z4l1dfTnYCruyCBC9LIWgr1lt027DM03BqLiRwM7c+rq/Af+OISgDQdOSHxniFq4PliSgYYNP0yieICJdokSMVXjQCJQapdBb4b7geuCYlQzXV8QHQT8zKaYVga0FOCATDv4bjVgRnmYHff9nlYfkhCaOW3MM1oMuyirltTGMr4Tl3zMaWvRZuwp3rIAvOIGVogS12l4SWd8GfbdYgfAz4wXOo+YTRdBfPszUjfD0MPLV5xrNWXU/VB1GpGQcRVT3xrvCEBPwXh/3Y5PVuY/cMqUZvQ==; 20:qg/QkA8GUAt+vujYI2WvT9qj29+uVde0z3f1+piSXMlJs4wWvtSZ/Y491aE9Zb5phR5m59GrMl6+TBHtWK7Xiu/IhDwoxhcIMOrwuM8e9EWGGXQbHL0JUdlE2qg159defsi42nhr7UKcSEgx+/3z8OY6sIyGbv8/X5/gBxvN2yGInhMRHESCZ6JzCWU8F4hqo//2IkxzsEVjcRp0fLcRBWGR0U+5W0nAALNkDave/uECmGVKYVxz1RypAsKfNBDu X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:50.3162 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 10/13] OvmfPkg/QemuFwCfgLib: Implement SEV internal functions for PEI phase X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf | 1 + OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c | 72 +++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf b/OvmfPkg/Lib= rary/QemuFwCfgLib/QemuFwCfgPeiLib.inf index 4f966a85088a..b97b475c7cad 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf @@ -47,4 +47,5 @@ [LibraryClasses] DebugLib IoLib MemoryAllocationLib + MemEncryptSevLib =20 diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgPei.c index ac05f4c347f3..1696512bccaf 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c @@ -4,6 +4,7 @@ =20 Copyright (C) 2013, Red Hat, Inc. Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.
+ Copyright (c) 2017, Advanced Micro Devices. All rights reserved.
=20 This program and the accompanying materials are licensed and made availa= ble under the terms and conditions of the BSD License which accompanies this @@ -14,8 +15,10 @@ WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ =20 +#include #include #include +#include =20 #include "QemuFwCfgLibInternal.h" =20 @@ -76,8 +79,18 @@ QemuFwCfgInitialize ( if ((Revision & FW_CFG_F_DMA) =3D=3D 0) { DEBUG ((DEBUG_INFO, "QemuFwCfg interface (IO Port) is supported.\n")); } else { - mQemuFwCfgDmaSupported =3D TRUE; - DEBUG ((DEBUG_INFO, "QemuFwCfg interface (DMA) is supported.\n")); + // + // If SEV is enabled then we do not support DMA operations in PEI phas= e. + // This is mainly because DMA in SEV guest requires using bounce buffer + // (which need to allocate dynamic memory and allocating a PAGE size'd + // buffer can be challenge in PEI phase) + // + if (InternalQemuFwCfgSevIsEnabled ()) { + DEBUG ((DEBUG_INFO, "SEV: QemuFwCfg fallback to IO Port interface.\n= ")); + } else { + mQemuFwCfgDmaSupported =3D TRUE; + DEBUG ((DEBUG_INFO, "QemuFwCfg interface (DMA) is supported.\n")); + } } return RETURN_SUCCESS; } @@ -114,3 +127,58 @@ InternalQemuFwCfgDmaIsAvailable ( { return mQemuFwCfgDmaSupported; } + +/** + + Returns a boolean indicating whether SEV is enabled + + @retval TRUE SEV is enabled + @retval FALSE SEV is disabled +**/ +BOOLEAN +InternalQemuFwCfgSevIsEnabled ( + VOID + ) +{ + return MemEncryptSevIsEnabled (); +} + +/** + Allocate a bounce buffer for SEV DMA. + + @param[in] NumPage Number of pages. + @param[out] Buffer Allocated DMA Buffer pointer + +**/ +VOID +InternalQemuFwCfgSevDmaAllocateBuffer ( + IN UINT32 NumPages, + OUT VOID **Buffer + ) +{ + // + // We should never reach here + // + ASSERT (FALSE); + CpuDeadLoop (); +} + +/** + Free the DMA buffer allocated using InternalQemuFwCfgSevDmaAllocateBuffer + + @param[in] NumPage Number of pages. + @param[in] Buffer DMA Buffer pointer + +**/ +VOID +InternalQemuFwCfgSevDmaFreeBuffer ( + IN VOID *Buffer, + IN UINT32 NumPages + ) +{ + // + // We should never reach here + // + ASSERT (FALSE); + CpuDeadLoop (); +} --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454217109870.6769726688758; Wed, 10 May 2017 15:10:17 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4B37721A16E42; Wed, 10 May 2017 15:09:54 -0700 (PDT) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on060c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4a::60c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C276C21A16E38 for ; Wed, 10 May 2017 15:09:52 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:51 +0000 X-Original-To: edk2-devel@lists.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=uMj8hIjsiy8s8UFhGVbFdpQhUKiZiJxdgTVQWw8PfPU=; b=Mc655gRRjhvtjDLbDVGKVEhJ7qUHSa8smL6hFNrXwLZ0ugoa+sGSduQRCmtIJkwJ1wuE9t8WB9PNvK5LQ9/jOf3Ig2QqsOLjoiLXY3U/NmsTdez/HlR7rxnqSMoN/4v0vkd8avKwlfrCUCtKi2DVNiBA/m9QGXukyv+CK3IGtSs= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:20 -0400 Message-ID: <1494454162-9940-12-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f500ff4-ac73-4a1d-0deb-08d497f14827 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:i7EmTvbPtA9GC2UePQXGzxss3gMlF3YD0I/4rJreJFmi2SVu3sE9Sk6imav2OgBctCKq/c4iOVkaoTLs52iBc2XXs8yGR8wZwPJK9Yq4NqbNy5w8K/HdB6XONBU/Fk9M0wNPoSAM4W7uy7RPbCDbdRalEoke45f9P5pHrj0QDdZhdwaYb3CMU+3hkGK0VBiyzmTdzCE//M88u/HFhJ0xGJx1K4iCyhIYp+jMfb5kt8UpGuSF9NcxGjNxhTCSD8giYz6j9+jufSY40GK04BCfqWMCbdc3IERiCoStpEM7Xhqol61mHjpoVkoEiNhrIXVQqC/u/sQdVRFF4TUkLH5sfLjPesfTDEq+pvcuecjB3Yo=; 25:le3893w/hz/vaNeqGUWLfmwAHzu6SCIXvIObbSTm7TO6dr8Oq3cD0pENsy2cbqxGBP8LW4QOl6bCkKomOveB5X9fUVuTMy9FWgVwHEBAMfL6cds4LP+8J/0qE5eRBzxTUh4arpACjdwVjn/bLMFQB7ibo+3XcP9k0S2S9nN0hI0EQxjFil8wMCeCywkyACjLNpVQXSRJX4ouJWmzBPle2YFaKnGtzAuUT/hz9FxZTYJfThNMaMldumOde2asS6ZwDAPhdvA7QiN7e3rbqQAGd9HPj+wYMfmCktPV/G4MIYMfTR91SOodIbgH6s1BhgXnYsboJuY/AFrz0XMhhVD2KqHMDCTnGAJXDswrL5loQ2GwuW3rgojZy7YN+iPAVjDTd/r6wOdX3E3TbwWvEm4j4PJ7rigXAF8pS/rRk8neJ1RImvfMYac03s8p6PUAGvW38Ck6puigaQOZsZT9kDQdSPJgWvAW5q11Ve80Ov8kRkA= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:V4r1CpdlgUGxXanqDOi6PtvwSwXgUA2t77ptJEua1R3nJgarGa8vGIDesVi7pEU5ZL5KUb3tTnUPrA7SBzTBfJgJEGGp0cnf6ziWHAr4AbEWLi3z8zOtFGHZVqPDMUQaBgABYwKoFxQWI3FVN2Xdi5rCNHkhhl5n9zchm2LpyJYHVZ3yYiT2j6KUW4HUayzx15Ra2r6eWJRmrc92RRfCXAwOFj6j0IhrazC9lA0vI/E=; 20:G+gOO7tMuYE2YkQ71mtjqDXqZJqjoe02cJKCSHto7cSdo8pNHKLV9Sjfeaz/+zb0rFtqWZ02bTVx2glI8iDmakxEHLyu05jPXHmrI9lJtsmWCnEtVgwOABo7Euhdli6jvuYIFAEH7zomk2e4hVvsGXBrThhGgyb3/sVYRBpU6e9EJBvHbweq4Haq9zHUUtP65Za5VoTgBRyA00gSmmIp0PEsVe7X5QYMmmfef2WdAMzzX1xEnPxM7GGnbYiY0+JbKyh567y05HKOQFVFfbaPlRi7g4HYtB2L91A4BgRkNshSS+h1fuMuG0Le7WNTdxb8juf1Tqc7QwY1RuZatYwW+XZ9FJBxkkOEty64LiwbKwtGlXzlWr3qmeBmxImGluDEAxOnPFj20e5kCbhNylnhH7k6RRzL6jvgCznLdyE8GgNvy/6ZYTJB9xvP84WxFvEhtvZbCcy1npj691qWcKYQ8mMuFfRiScrsfBFNNCJ3SfpBf8/lR38HW0oCUEXnaVjO X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:EKri9a0Ei0I0Hvh2tr05KHk/SvhB9F+4s8KVamisc37ckGnX0ZOoLqK2VhISI8m30piPfFKC2Lj3oHLwoJC6aDcG5i6zaPY7HFVgUCcXhrzyC70SKn7sP5FSv8z0yjP9Z7vwXjwgfTzW6+xV7mSqUdMHm4z6q/nQbK+AlFa4McV1GaUF//PrIwDOsQ/OwyngF+eknsBK6R23c3Ey91e+met+CRdO3Eh825l10KyByOF7MR/3QU0xI4ekklvXWZpX6FDZnuoXpQkgTHpdA+/yM73mXidaTrQDlEF3LGBuInenIGtNMEogMBjeywGurXyJhrycPAxYNIATe954vHa9vcpuHPhqHSbS+rBvkLhd2bw3N7+hEVxKKfL/ojs+N+NhQ5Uw/mfQAEBYEPalen+EJxkLk3i/M0MBmneEZa37iir2XoHKikJAHnGgYkSdPAS+DJhPYHIJovZKqOTx8+gWlYqtuzjNrbIMoVSorQbxUhmRjUChj3Dv1PkQDmEU60X7wNgWTN2XWymFTtFXGbAisKiXnOK7JAdaT5rV0DiTkgNbLEYOUltkmUUwhvSiGMmkA/wtUkO8yS+gdqa3c0A3QO2GlWMDb5Y09ThaLu4kowCAGR2bxITVCc6eqNByTiW+dj9QqSFgtV95BKubYUV2CBFCzBEkYpbhfSbEh/IrIswYg48yA/y8dRvSDDg99SA5H2EuYPI2ugYxQhxeu1/1jKDLfolwzehNB7noUvubEhBK8Y7EMG6M/CO93MHI9y0yiUyCWmKMYVAt5bwJsrUZ5jjzJ6Wlemq8ingZWXBceNxJC0gzjoaspCqzGxQqv0X93JAbbILZ/oHMks6xj+v4OjbK6OYfHVS2PIBXvhjQCBwN2+Wyhl9SR4J6KkyD8JF5 X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:MtC0M7tmqDH0n9wlFu4V1evVGxflLfJZZF9S2DSTk?= =?us-ascii?Q?nt5QgICZa5inwtLKyu5feYpsFUDaTuMQpAWGn/RgEbR3MVozwCrlmBQsHUBm?= =?us-ascii?Q?+JqSP+Hspf7K6LitkAjPo1iQD9yn2qwR0ro9uXZfBs47ptCAhKnU3DzIdqAL?= =?us-ascii?Q?+xL+8Tw17BgyQwRrX++yfY+6NcFl37y38Zy0aEiA5BnaW8hblzhcWHWW4AvL?= =?us-ascii?Q?7Nf+9BnC3BMhU8SPZ6rUC3T0ZtMrywgudhvYi2s3SYJNSC123FTNUksd7nLS?= =?us-ascii?Q?tDr/1QQLtsEluQWhbAuYuxTPfHc32WvPf8X3OzL7qZLqb8RLMHsB9PCj2jYV?= =?us-ascii?Q?FvK6ghpQz9pdSdnJEHGKxENtZOeQ6W9NsqRso2jDpzm51RQXA36FhgWlVegm?= =?us-ascii?Q?w4vjv0tNvQePTohNBXV+I6bmqjc4gdqNJQvAtJf7WRsSHmHmt0tswXOQMzRQ?= =?us-ascii?Q?jag/6bTJoM8nKScayOKtHBnNuAS1S5IQlhzNbacDsFUkweph3xa3N9YjdxR+?= =?us-ascii?Q?c+9DR9FizfBMs1V3FJ6KE05/9ngZh4uaGTChPpq5SpJXPmovgYiOimMm/U9D?= =?us-ascii?Q?8NqJadtJPMOL8XljAux4P7qxCR63tqIE3+x02a5e2cbbESz+EeLr3B1lADqa?= =?us-ascii?Q?4bsUx45O1CKbLdoT5Bb8t/PW2tXAEf75F26jW7x5sEPSbLItev1NV8q9BqNi?= =?us-ascii?Q?pmUJc33TD7JoQrpu+R2rKnnIF3c9Ye0oQyHAX0PoixOvzMjVvdyZN1W+Kckv?= =?us-ascii?Q?era19B2wlfkRxuKakOH5AltMODPVe3yQ06kXp6bCgLtHHsEiKYv/lqpBjMZg?= =?us-ascii?Q?DIfeqJdNTMdbWasksAtVr/8k1vmE9Qh3jcc0Rudmc5178Xe2RJ+9la6iyJMh?= =?us-ascii?Q?jgscl82mGYte4L0rs41qRzRVvZKV14WHbLe9kWIYuXAsAJKRESxTv5eD9hYe?= =?us-ascii?Q?sS/XPeqx8zT/MphtfduH7LRIvrnIMHllcgMLyNZz6zgpWXZ0xCtJqsRy+ZIF?= =?us-ascii?Q?6h6pZQGYqfgeyvM0C2NXC1t?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:9YwgEoI2mrxjQ1guGwjUDoGKsJM6CwJ5x703fWcXd8JS0iJtBiDLX9/eXcmfB12bZ2mGCW0jVjrb3G60fuH4E2DX+VBUq+r/AOEJBBrFC6OH2MqaHkyUf6VVGXrBSWuJMgFpKXc6C6R/6EEk7HaMPg2jRtgO0k/C5KXD6ZC9Y+lqU5SmsjAwC4ECD0tVbWkNXhuvX9Q9NEo1dznqKenAvlF0ndtfUQ2f+2ci8mB6ODVgYaUGTb82wPYIbL1mFMOojzprwN6oLsje2dpOphV6gYxL77JVJxFDgXF9Z375lcBUuyZ8pjluP9Ls7bhdnNRR/YheipYJVCPG185n9kH3vL+xSRy3Y0aIMvLtH+4bLEsZI2sXbGn99jBNi/sJT46lKyMUFov97+iK+OFYBKpYdZwTIzWV5AZYll7J/Kq7KC05w1zPymDt/BJM8ds991iPqyUYelnobVGiVp+2sDjhkcGC0RuHI1eOqmeCLvjzE//tpC3E937e9XHO4MdZtlMxsPFLKqAlPEIFt2MZr3f/MQl8x+btPi6tHonFeWTE4g0=; 5:xyo9te4aZph5NveDq2y/FVvsmMT+YLvyYplh8Vj+X9J3E1xlY7NTERzRRM7vBeAp0RxhPp4LhK2R0+EGTzPcUlANHc7PBygvopZPTL2/sjKfgQ8ytZlQ75ZYTngWJUzXfVisnLH+wn+v7okxlB422Q==; 24:NT0gGClsU26CmuUCDMKAHfjOmAuyJDM8p6ky4REaIDPvF/tWHCIaRL8hZNnkoKIjyYOjnbSr/N0rzEk0inpuySmS5W74KeY1xAOGyJKkL94= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:frv2eLCmnBX0XAO/5f4rgmBKpwenWHLEte7kIPLHzNiBWOM+xx5ZLmtRK23SP2Lno3TnnUVH2izyZdKDetu2hY/0ZjgX4/iMyFIwCOay4VRbl3OmK1SZbQLCwoCV9MXHMOG6iIPHJNo7IY+hLeGilQagv5zm2MtlwG+kv5S/4oL3M1VUuCPuWeYZWZYj3JYEfohIgjj7SP1KXB2jj7BZWjg0oPHn+vSMIOcgogT3GbAe8V89FBSRMXC7CK0v/ZSF1liot+AKIqaV95Fo+nqctZenDaFdJrQUNG9IzlVOs3oRNSdaoqsAOMzhCC4+1zQ0b60+lSzcfX9SKh9c3d/XeA==; 20:L11R06RvqWmdLX3TyMJHodEato/78Zy1lpLE1/SRIwx2OKscujr7Guf3FocMuRek9E/aq5Bn5lpAVxiwpaHAmlVrVnJqGc+JEtJ1+DG9NXjo3m3XUyfhjRN+pL8mZiRVTPCbjREouk3l1k5asWWAG7w1LFjQ+kaz1jkgsMuqXnaqrLFYXUyYik+Sj9P1PE25ATRe2IorUh/urGgclzMHAaC2+fDA1rCDaWHUqayTcC9LB83nbolbZvlU+EpSVbUC X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:51.2779 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 11/13] OvmfPkg/QemuFwCfgLib: Implement SEV internal function for Dxe phase X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When SEV is enabled, the DMA must be performed on unencrypted pages. So when get asked to perfom FWCFG DMA read or write, we allocate a intermediate (bounce buffer) unencrypted buffer and use this buffer for DMA read or write. Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh --- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf | 4 + OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c | 107 ++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf b/OvmfPkg/Lib= rary/QemuFwCfgLib/QemuFwCfgDxeLib.inf index 346bb881ffc1..f8df77f788b7 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf @@ -39,6 +39,7 @@ [Sources] =20 [Packages] MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec OvmfPkg/OvmfPkg.dec =20 [LibraryClasses] @@ -47,4 +48,7 @@ [LibraryClasses] DebugLib IoLib MemoryAllocationLib + MemEncryptSevLib =20 +[Protocols] + gEdkiiIoMmuProtocolGuid ## SOMETIMES_CONSUMES diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgDxe.c index ac05f4c347f3..059666ffa99b 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c @@ -4,6 +4,7 @@ =20 Copyright (C) 2013, Red Hat, Inc. Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.
+ Copyright (c) 2017, Advanced Micro Devices. All rights reserved.
=20 This program and the accompanying materials are licensed and made availa= ble under the terms and conditions of the BSD License which accompanies this @@ -14,14 +15,36 @@ WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ =20 +#include "Uefi.h" + +#include + +#include #include #include +#include +#include =20 #include "QemuFwCfgLibInternal.h" =20 STATIC BOOLEAN mQemuFwCfgSupported =3D FALSE; STATIC BOOLEAN mQemuFwCfgDmaSupported; =20 +STATIC EDKII_IOMMU_PROTOCOL *mIoMmuProtocol; +/** + + Returns a boolean indicating whether SEV is enabled + + @retval TRUE SEV is enabled + @retval FALSE SEV is disabled +**/ +BOOLEAN +InternalQemuFwCfgSevIsEnabled ( + VOID + ) +{ + return MemEncryptSevIsEnabled (); +} =20 /** Returns a boolean indicating if the firmware configuration interface @@ -79,6 +102,21 @@ QemuFwCfgInitialize ( mQemuFwCfgDmaSupported =3D TRUE; DEBUG ((DEBUG_INFO, "QemuFwCfg interface (DMA) is supported.\n")); } + + // + // When SEV is enabled, the AmdSevDxe driver should have installed the I= oMMU + // protocol which must be used for mapping host buffer to DMA buffer + // + if (mQemuFwCfgDmaSupported && MemEncryptSevIsEnabled ()) { + EFI_STATUS Status; + + Status =3D gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID = **)&mIoMmuProtocol); + if (EFI_ERROR(Status)) { + DEBUG ((DEBUG_WARN, "QemuwCfgSevDma: failed to locate IoMmu protocol= , disabling DMA support\n")); + mQemuFwCfgDmaSupported =3D FALSE; + } + } + return RETURN_SUCCESS; } =20 @@ -114,3 +152,72 @@ InternalQemuFwCfgDmaIsAvailable ( { return mQemuFwCfgDmaSupported; } + +/** + Allocate a bounce buffer for SEV DMA. + + @param[in] NumPage Number of pages. + @param[out] Buffer Allocated DMA Buffer pointer + +**/ +VOID +InternalQemuFwCfgSevDmaAllocateBuffer ( + IN UINT32 NumPages, + OUT VOID **Buffer + ) +{ + EFI_STATUS Status; + + if (!mIoMmuProtocol) { + // + // We should never reach here + // + ASSERT (FALSE); + CpuDeadLoop (); + } + + Status =3D mIoMmuProtocol->AllocateBuffer ( + mIoMmuProtocol, + 0, + EfiBootServicesData, + NumPages, + Buffer, + EDKII_IOMMU_ATTRIBUTE_MEMORY_CACHED + ); + ASSERT_EFI_ERROR (Status); + + DEBUG ((DEBUG_VERBOSE, "QemuFwCfgSevDma allocate buffer 0x%Lx Pages %d\n= ", (UINTN)Buffer, NumPages)); + +} + +/** + Free the DMA buffer allocated using InternalQemuFwCfgSevDmaAllocateBuffer + + @param[in] NumPage Number of pages. + @param[in] Buffer DMA Buffer pointer + +**/ +VOID +InternalQemuFwCfgSevDmaFreeBuffer ( + IN VOID *Buffer, + IN UINT32 NumPages + ) +{ + EFI_STATUS Status; + + if (!mIoMmuProtocol) { + // + // We should never reach here + // + ASSERT (FALSE); + CpuDeadLoop (); + } + + Status =3D mIoMmuProtocol->FreeBuffer ( + mIoMmuProtocol, + NumPages, + Buffer + ); + ASSERT_EFI_ERROR (Status); + DEBUG ((DEBUG_VERBOSE, "QemuFwCfgSevDma free buffer 0x%Lx Pages %d\n", (= UINTN)Buffer, NumPages)); +} --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454219912649.7959035677151; Wed, 10 May 2017 15:10:19 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8700921A16E45; Wed, 10 May 2017 15:09:57 -0700 (PDT) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4a::631]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1D94921A16E3F for ; Wed, 10 May 2017 15:09:54 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:52 +0000 X-Original-To: edk2-devel@lists.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=LeBCYg8wDUBEk8nF+d4S9SBiPcjoGkWmNEIIAaBQTgA=; b=NPF6bG9uECK25CUZfszBRiTAOa/FHcTLBkZPOGOk66jX07DEysP2mSkiQRX7Om/chxqrFo5Lutvx6HMQuRsWsUFxQXVCaQHclMe99dLOB/0oVANWHCGxkdqRMnUt6kTvWF+awkR3VJxPM5zjt5qDStOTY50EZpt0o6pFM5kUibo= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:21 -0400 Message-ID: <1494454162-9940-13-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 13916d0f-12be-4011-0bc8-08d497f148a3 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:SZXAlQnkjXUXdXTCDhTZFNCvhi4K3drDMSSYkqwGh6f+GT4uPbAkcL/H807C10/SrQNNiD5vhhQMGSN/rXd9rkBA7lyDNjTIJm9u1tBDcmXOn7E6yuYXLuif4/9N+YMlfs6trAFt8S9O4cJujJHQXTuJC3veDWezc5YUbsBT41foXc8VBN/ya9cfQe3R7H8kOPWPkTML8zHkuuW8DF0sunXAczffLlXjRENLnMEOKqeSWGdq4O2l8PZjU1qd4DTTvOrS/LxJmlv0Lmmxkt+TRDzGMNAH0J4fVZ4gt7DMmxgnNBS/YMr38RHKJ097Z/0EUfe7CFlcbGRw0nt4NtrUDN8emtK3mI+D2MljpQ6wpgw=; 25:2ecb8U3r3UbMsaT+OQZBEa5WXOvKEHUrQroJ7YFoxQ4Rilrnwj66nzqVIJ5tiMSQ+IlJ4sma/lnd2vrsWqJnsfGY2iVDzS+52x6Z1x68rPED/EbGJNtu7Tj9i2M3orcBBl8iTk0l6/tlW+zKKqWl59VTkmF1df6MKwI6IdI5dKlSYjoqC8zqmgHGFYKKS66X4OWjA040KNNJnE0CRSYdR+NCI7YNC+qRDQP7rv8vF5nLvNKs5qdBx6IrFN7cIJrcOacF0R30cvAvQ9FeGdDneTxmy+haPfEz364BlnWbQokONqxUIzXQnt0NIUQl2wLHGtkokA3D4jV3fw2Yvv0z5/1RjQjrQGkvt3llcejGP2fdQoqJ00QN6l7Ki53pTMJjNKB3UvOEzwPE7Vy/JCqDu6Wxi4ge3v4nsRgrhKa5h1W3qJufApjGLxWZZm1BAfdAz/yHFdDrIsne2xZeSpEagz/F//uudEuNO5Y+hnpa0L8= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:vNGbAl8Hhd0bKlD7ugY1AWFjftO+Vu1uel3C+03NlpdBMZp/kxszD9MVjnf4AEfVaDEIIpUdty5hLh2IKXHCUatxaPaEP3ZVbh8iwDy2zHJ2tvYtuYmaQpjE50e15A5NVpiCKaX3oSLWeLZDwN1Lkajze7rIhtnnmwozDPEZZIPYtdH4XOmGmqdjW+UdixfUfCkVe4ghlhbmR5mHsKNTdSzWb5jfiRKBiyoT9QMntwo=; 20:8LKQWzAwWbE60DI6jwV4MdpjDjhY+viHQU4IB7PXWjx4aG2PHQUgVqaZChp34U+ZVI7LJv8rPF43luz9VvArcfsGJ6kAUA0O6Eyov3iwkh3FPyHUiQHxM0geHDb5wDkoVX1ldKeRWqBFX4NmBgTmzJJ4ryILr7fTyeoURqrTNKCV5OuT9AqER0tjYeqBRRDwYwoTWtLqPDuVi/+2NUAeo6tJWmsiKJGwo0Z2lIGqKkEwyrHhMpYr+12FYWUMtLPqb2qqmxIMCfU2X/2XRLrL2zVdEHDEF3Eoc+FI9Mq8nWvjBJS4WC98GgG7Tol3Hz3te/fuCddKo37z/z76ebsOcVgdLVminMK8VxP++Zv1a5ruVYuSnbo3DWQ+RNpnseHdiPROaZDOJ9+0KXrAk0/bMaDwivfEAWgnyhXNlXPerAwihhp2Jhgd5A8yZPHmInGudrDgjF0ioVCY4hHj35P5uVlZiLxXPQfNx5EnGaXgy5bc04N+rNNNfZc1gKIyT/6z X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:CJ3KWdzSckQg55Ysq4woWtyy17M+TOEYpDwFv9F+1jfXGIXphS9RemJA95E6ZCav9R+bHyn1ETwbNJgWlprdrNM6bDLuf7QSG5UxATCy/VCosDR5Dy3BtyZbAETRHKBMXz/NtTtNpWT1B4gswVCPr3XrSyZ/vLX+EywKqEFW0zp2MwoeI04brKz9F5R6DSyiiFY9FIwtI3J+SAKaQpwKt2tY50Hx5wuLFqypVxgxoBdWwQ8+51/aPGfPEBKO6P9knMc3kaqSI15fGynhfGB53zjEaLI/zYeUCu30EMjplbP2kMEvTQGmVJJIynlAeqdqgortZ9uMHKqNFtFqwUO0pMcyfzg4KrFZwGGKKTFcSsytUbiBQNju7t88NZfaq+O0g0ng3az2uZhGFuTfhR5XXOeiMXkvN8R1abhQSj0yH3xNW3UaCwM6sy4QP6BvrEEyZ9LFJL/Lje6jfU8KE5Dz7aaKiOmZmMsVN+rUZe4BZuEEsqdwxgr+8NMzd8JYn/IvQx2zgXzbRWSCokjVlp3oWLZyWgiETqV9BUWP3o3rurqO5DvirU1oa6a+TWeIhqr3wdbT3gkOShP+fUI/KAJi1ZD93HiHI/xsvsOpHsHe6eAbKTHq2XxkIKp6KIFf32Rni+5FlrCBWt4eO+AvUpowuZTuJiqW8t7tGhaIlFiFhp6vH0NnmuuGq0YY4Aa3cLzTXPXLXDzoXkFfy7nTHxyp7Hqh/wZcOKqPucxSRbTvYjxz/98WxLVBBi8xh7k9i2xBCyxstaF1Dml2f+KBX3prijDTgusYFIYtOasm5W/bMZpTo0LQqFN60g4C/7FhYZmOQ7AHbOuUzEXBsokL37TD/A== X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:ixk83csEaCSjz7j1NB48tnh1wtPPsjgzgDj2MQlXu?= =?us-ascii?Q?m7tJdM+KI25gXhY+T50GbKxeKYaJNuGU4l0zcm4X+dd+gi5QbZ3GqLz9VGf4?= =?us-ascii?Q?vVOw3XoyU6LI/vUPL++Q9o0OaM6+05QV2wKAaqor+oKE4CdN8q5oPx1hf6kX?= =?us-ascii?Q?w1F90bzQ8uEpfWUxp7obvB6m4/FWEIWFomr00y7GIS5TTrlAFFmcMFskeP5Z?= =?us-ascii?Q?Hy6uJpIVU/Cb8+mO/tmoo60vb0rx3lat0mo8hIa+TQsWprZoMULWHfPB0/Wc?= =?us-ascii?Q?YDf20qR5Lym1NJ1dlPQ0dscdVHl2fdUklVBL5Bat/HQBxTpBrotSB8GImUR/?= =?us-ascii?Q?s8cqugH0kK7b2+wb3XIvXe4h0Aglz1VK826pkOpRnULKsERfo9q+WBL3zF7i?= =?us-ascii?Q?gVoEbkRQTe1bMIayY8LaVUSXD9QHDPDv/3aZIWchSsvW5Uh6YB8VejbSsU2S?= =?us-ascii?Q?QQzns3vhZJ3KgTnxQvwpTb37ac7q2SrOpg3pbCZ1tCxC4O1RWjcqy6+YqmFS?= =?us-ascii?Q?I+LPhhLCvmF0d2VBRMnlXnd9OGqdHh8+hXzDxeL0Wa5iaSuBA+b+ll158lIb?= =?us-ascii?Q?AOI2AipMZjBN9a09ki9fRcmS+E5fcegerQHlmiIRQO67omvUk9dlh2Vy3rFG?= =?us-ascii?Q?gu5zzC+1iURVX9REzh/8ppPnYmQk98HtAsKObKrt2PUXaMh0NKDgIEwoEfz7?= =?us-ascii?Q?6pURn3vQh8M0iZDut9j3taK7XY1cmwOwnLcKapjadXfrhvkIUOaNiE3Ls38u?= =?us-ascii?Q?RQTKMHCHD5IIGTenLgWLorej1pPYMfJbkpadDwbZe2zIoYvLOKcUdW3ezyv9?= =?us-ascii?Q?TTofZuBRsiRQzyD4yNV04ZNKrcQyD3z4iDuu9UQvEJErqW1DQlqaRjE8GXIc?= =?us-ascii?Q?RXKfCkE6W1KMpeuVeNcs7g2A7SlNs/x8Iv1R46d5uxIY80YvQPH8GVEMl5GG?= =?us-ascii?Q?dgNO4Bm+WCJJbJFxyMZCq633DfEBZKIzyvkifnn4nmmbYDqHnzwYGz17IHxt?= =?us-ascii?Q?Gh+9GDD/ld98gVPse5F0GeP?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:L30ocepRm3zwIQ8BtWjjq1PeMQsf9JuJ+wDUtP6x5tc6IPRl6byOV8/SuNr2upIJTJ6C2BdWS8TN6Mti064TeQ4876nB2uA4Pwzt/gOfOP4bMI8BS3MQN00+YJshlrF0Yjc525HQQqqFqBa5GbZA8LBEkiJUjqlCdutLC+FFawj2CfAxYyIA5kILp1aAiukHxT1TGUmvK1PxUdTLumJ3FYRKrarAb+Dz1ootU3Aid7cia1xYwcg5b80IPElZmz8Q/KZ8RTGSd5rUSU7BPV4bvDtD66wT0kREYT3+btrP9aHKFkrcIiJNFaG3IdGbprRaB2DP9M70mzhtxA5jUv74XI9kVYb4SiU1szSus4x0UBJT7z9x3HUtFOoTQGPlVV1H4xBuglJlhSwEBy1rtbXBJ9BfiV2g0Le9Q0T5+a0bE9Pip+T3WWxxwK74dmwWaCIhL+rD0LEqhrfdEgCVbulSfdKLaGI8PrFkwQlYXORDYuV8OxvFP1SQY10d05dG5q+27ye7XlGsXYHKU7H2pZiiCi8yWJ3j3czAKaKa1ksjmbM=; 5:0J1jyzwlulxpCjzavAiuv0a7mtBRrbJ+NZ8xwI6FLDdiJSZYU1s5wzEJwmfcDIsnOKDjEq7QFe3osVqXhhy5j0hYN8g5xsUU3lPEskXfMMgGoft6BG0ru3z23n6lPfcHPAQRQG0MeIjw35ybBHEZCA==; 24:mr9mmShYYZUes4HV3lHA2lr6a5ePQIh6dVU1lH+3nIryGAghujTugAoprCfY7jvScUsLk/5bMFQ4B+Xay/mrdazYmeSB/gqIW6fkhP/DVbk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:JQQ7tQFvfyJRFymHTtMZfClyBUtO/xD7YcDVNpvD6tT+zKuCKiRBDfTPgHrrglo/6vxCBTgFFiFKJFQQxZ2Sw/tBtx40L0l7rgmbx4KURvHEBC3tMrwC0pgxp97p4KyMAyAkR5hi/pK163FpR08ZmDlk2EP7PimcUuNprU7SpOxsUqO8dihjZ57DqoFK/1xpbfgXOKnWyimfMWy9FAFwNN5miqLpQxXGWinmawdLXgCd/XRGrIWCKbcmNLQ0C3oC3770FZOX2+FkV9aSeQZ4mK3GZaQLZ6gsTriOYWHLB5+Su9ye3dxdsHfEhyrKwjV89b2eRl6x1woEOJ5hsLuhAQ==; 20:kwzgOgp1qf06IpqwonimTKngWYvr0KekIyH1UTREC0gH+0G6hh+Q9NrZIvwfIdYXSgecQpaljjyvIFvIxQeGHUedSz3UiRdBg6UYxqJ4iap63QJz7X8Yg/aHuhjiay7lzZLwPVUeqnfcaGECgHeozD4wGTX2AFSLFrd2GLXWlNTWIm88L7ht2FRyvfmARjcMVAvy1vgXunVU+5qLrfUPzpKEGYJSdaQZxKDVlBpbtWyRg4XotrCI6IxOVqeukahg X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:52.2406 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 12/13] OvmfPkg/QemuFwCfgLib: Add option to dynamic alloc FW_CFG_DMA Access X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Update InternalQemuFwCfgDmaBytes() to work with DMA Access pointer. The change provides the flexibility to dynamically allocate the "Access" when SEV is enabled. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh Reviewed-by: Laszlo Ersek --- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgLib.c index 1bf725d8b7ae..73a19772bee1 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c @@ -68,7 +68,8 @@ InternalQemuFwCfgDmaBytes ( IN UINT32 Control ) { - volatile FW_CFG_DMA_ACCESS Access; + volatile FW_CFG_DMA_ACCESS LocalAccess; + volatile FW_CFG_DMA_ACCESS *Access; UINT32 AccessHigh, AccessLow; UINT32 Status; =20 @@ -79,9 +80,11 @@ InternalQemuFwCfgDmaBytes ( return; } =20 - Access.Control =3D SwapBytes32 (Control); - Access.Length =3D SwapBytes32 (Size); - Access.Address =3D SwapBytes64 ((UINTN)Buffer); + Access =3D &LocalAccess; + + Access->Control =3D SwapBytes32 (Control); + Access->Length =3D SwapBytes32 (Size); + Access->Address =3D SwapBytes64 ((UINTN)Buffer); =20 // // Delimit the transfer from (a) modifications to Access, (b) in case of= a @@ -92,8 +95,8 @@ InternalQemuFwCfgDmaBytes ( // // Start the transfer. // - AccessHigh =3D (UINT32)RShiftU64 ((UINTN)&Access, 32); - AccessLow =3D (UINT32)(UINTN)&Access; + AccessHigh =3D (UINT32)RShiftU64 ((UINTN)Access, 32); + AccessLow =3D (UINT32)(UINTN)Access; IoWrite32 (FW_CFG_IO_DMA_ADDRESS, SwapBytes32 (AccessHigh)); IoWrite32 (FW_CFG_IO_DMA_ADDRESS + 4, SwapBytes32 (AccessLow)); =20 @@ -106,7 +109,7 @@ InternalQemuFwCfgDmaBytes ( // Wait for the transfer to complete. // do { - Status =3D SwapBytes32 (Access.Control); + Status =3D SwapBytes32 (Access->Control); ASSERT ((Status & FW_CFG_DMA_CTL_ERROR) =3D=3D 0); } while (Status !=3D 0); =20 --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sat May 4 16:26:13 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; dkim=fail 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 1494454222762365.6666830331445; Wed, 10 May 2017 15:10:22 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C1E5E21A16E48; Wed, 10 May 2017 15:09:57 -0700 (PDT) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0608.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4a::608]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B659A21A16E40 for ; Wed, 10 May 2017 15:09:54 -0700 (PDT) Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:53 +0000 X-Original-To: edk2-devel@lists.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=e/QD1Ha4VJF3nMAPhTrZWX6ZBFd3ZswQT1OEbCmYUc0=; b=Fdj00GtBSKcvbGgHSd6MIpg3fgYF1sURUHeETJdP7S/iOW7gbwoOz4CeIFfZ2UGzb5rWN5C9INmUWlrI8jSMbNjLYxz+1YP3Trt4MgnZBLUlm+NxcSBMFMC95ggrtt5NFBCYgcPqNRjEXnPwVNC2HOE5wWSKKI3rW/G3y/jfdKQ= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; From: Brijesh Singh To: Date: Wed, 10 May 2017 18:09:22 -0400 Message-ID: <1494454162-9940-14-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 814994a0-efad-45cd-f14a-08d497f14935 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:eW41r1kyVmb7aWP+8Pf8+0Qb6ssZIVwo2RjkDSpmnQqAZbs2H952MFc4T/M/1HBgY10K7/xORDv1Ji+i0BPf7ChUvSUjHW1zhBFRvQyydkVM1cMx0OluGwZqS63TOmTJZlLyHcvI3oDnO7BulG/GMPpuAcs8BNapLqaez/wDV77z/8+CYhOPMIfvpxi4Ml2g9ocFZv4YV1GtPite5p7DeaZ68BBAuzD3miytoHWpQ8aryDJeJT3bW0Zakvz9mVycKZBeZ07FPO2yA08UXbO+K8YHv6AVhfw+fPElLaBvZqCShwgI1xXsjx0TJzJm+zwqWKMllU2wgQ3MvvxXmHaGF9oQVaEkFmXd3vRSBerBAi8=; 25:2d3Y65Jjj2hnkf/KP7au52Y7Jqx8XhCHu0GzyI/2h1EgdRXRFEiXmCDjdxXeVg1oZYE00XjkG/uwzM65GKXDKHMc4FSvUI3ykLv5hUhijACYblIWE5tRwOMomjB+G1d9YdD8j5Qgo9yTuR2Ow1WJc9rkfZQ3xaSu7Kl/Id8RV7IM5OvUBLiUewBujyCx23cs8pD1mRd1gqognEJyRN5Rg+HGXyRbsajJg0aUIkeFC6t1J/NU95g+67UgE/evjbomJt8Y+7z3T5k7A4AAGOj77kUNw3Ohlv03dwmhPSYFdw2S14wvmC6giUKawVhdT4hIwn2vR0UT6RAqZzTELR7tvq1/8xy/4ZQPMLXVZZ3JIwWTscOO9nPy09cmghyU5eBQUzEEkqYqLoMfkPG5sg8BGqw/OSAPLOhI1kM+gcpmwHm8/lworsCLA3j81eEv7/rSWL5lBDB95oQ3ypQ8LiMRCQjsrbnkescoEMLBc+koWLM= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:SrrOmZ4oCewGC8nRKx6JjzZowRlwCWrBNKP8KrepZzY3W5IniojibHLYAvv+9OAicvZYCTE0GuV38HVSyb2Jy+SLAkjUTn08ZpC0GI/ni5m4hmgghTH/y0WOBa1kj0kyuyJbAV3U8FNQSjTDXJsP3lix7HD+1oB5sMHRjPueTSdO7ldaUbhey6VG4kc1SYy5mJhoP05ruadNLjcK4e3LUcDBhG+FGWsFaYDupA7bbtE=; 20:Oo3BmRc0q+4Arq+81VQxvTYmGuIafOpgNRJeryGglFMMwdX0ifoMdCekJhgspnm82QoYEjSeANW7ULSyy+IDrYSX877fp1lrc6X4FDyMTcjGWEAv00e8yUOFJbJoRn9/nT+u354SaSdnj+vNF4BAB7Tt0gR0t+bq7RDO4z9MQ8Lg4+MZLt9eit+ugL3JoIzu0MVwqTqtm/bVwoPZ82i7acvt3cVJaxdbbuXjEdkPyfINh0wwx6qo/AoRZUn1UD9ANyVeqy1x8FjfN2HWGmY/frOOR/Fenm/6w0ZE/qU2KrtARnZ1I3soNSRO/ZzEN6W6RelRshD2G7uPm4e+vBD79W7xMCPp1iRO12UYNQQbU+SCQPzMtTZQt/cYWS4W6Cy776tnUayeFGl/rKcS/D+ltzbKhET9VT7rzJlh55O+HWlyAC/0ijlQcRJM24MFCpNOIoOge4iMtDG0MlsIoegnkArb/0zbjqUw3/qaZssNSMLRCR7kOtTI1HR6GMOllbur X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:UeOGq8KIn55iDyAxYEqGZxKEWlDpra3lgWd1uyVDwDb84AaDfwrPGyb22glHYd/0cLwM1xs8IfFTrBr77yc8MAWKsVTmgDM48CkRNDsEBD3Zk9QHxNIu3wnzeULTG8wJJ0oi4t0FtiDro+b6Wj6IAuKJncxZbASVtUq1kwAp+eSCMhE1Rbdz+85usoMsHSCHNWf3BZkfEhROdbRDozwSwvzwUkNLc9FDG0fO/Jo/qOic4BnfsOCkv1TW6j9uSQAstGT/NUqE4UbdZAJgV9uOiOhlGTKGObL9sUMTFUw7Dq2BsuMrsnXnmuYKuUi950Ia8IiG5ff72hYf0HUxNxf4n0JxvHUehTuKOzH9nQs6UjH2477xzkx9R4JndlvQm2As4Y9St4rhovuoptSqB6Cnd/cza/l5N3CD7Xcvf6D3tusKI7Ih9rbSc0OBBVJB5F5l0T20dHkSbtSMJkkXQuww7b6E78WYnzOMenpGhhixnSDbKzeX3dUJrWyKpZRjeobdGHsIFfw2GKjw4Qdy7BmHprSVztz7tyMe8oHL2CMcyHD5ESwuf613Bf7sMXh2tEv922bEQOwHyXj8AGuVYuJvjX7SmC0diccMcqx+Twp36p0RDEAo9PDV0vhmSPuI5ep27jZeorFpjgCYIDSmGx1f6Ar3s1YaQP91reCy9nXek4T1qaUpbp1O43fshXbv+3D2EkAiC+xU9r+8POZfq28VcICfkWeCCUVxG+xEWaOWMustpXVtpM5539+D6l20UaEURAgaX02yFUhF5OlmJbzhT1Py62cPwpuYslXHmMNd914PJrGaAx/5fhlHzBBrzobHxlpxYW/5jNES0PBX/Fm3I6Mbljlzux/pMs7k8qMKJFKugYYZBw043YCKqG8kKjL7 X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:iH1kBEtKRR0Dikb52nygu8TSJlDKPgM+ffNSLH1eT?= =?us-ascii?Q?Bg+DPb+0S6C0yyiKfdDL2eLYqGX74FrvgXUdWpN2yv1lOmkqE5qogWeAt3NV?= =?us-ascii?Q?q0q87qJvSPdVXnVrlXuOg3F3TWSbNdKvKoaRAGvZHLFuEPSxIuZuEj/6CqEb?= =?us-ascii?Q?WJUpMmKS2BQzHqXqCYsRQbHIb/Mp7QAeVRtdMK1VdVLwqNZXeHEHPwdciIwu?= =?us-ascii?Q?QbSyyG3KFMj/5OHob19jahlKoBOwMMqpJJYhuZrkW58fzFOGID1YRmoA0WAw?= =?us-ascii?Q?gJNggoKtxekvaciP1yJTBkPZ7wfcun0B+IICQl21zp8BJ18mW17gVuaEmYXE?= =?us-ascii?Q?jKDpatQNIffocuRN25cMy3g4xct3SdhAKi853Lvdw1RF9Z20ur/dSz1e6Lcx?= =?us-ascii?Q?+ciJzeHZqWr0fKhx4ZNsOnfE6Z+mnaTdEcdxDqerciPxZGJb0tclqsqat7CW?= =?us-ascii?Q?j8GlXuxmkG5zQRTcNug87xpy7iMNYRAAJYQ0rAnogca42yf0Q2ncP2OV9dAT?= =?us-ascii?Q?2hzL7rWSf/4ZIdAOgpHCf0pM8/BULU+Q5p5Far26DC1rmgEmz+wFEG70/rmk?= =?us-ascii?Q?7Qjo6O4l0B3lPLl2LaxZmhDjzir5GfQruF830YdH1ff+HsCTOrOVjAWfIsNo?= =?us-ascii?Q?LfoXST8Vywn3t5mt87ZqyE4C+on+aDaZrnoOLraECGVuQzlaMnPgFiSusmzA?= =?us-ascii?Q?pCxjhna0j8fhQ+Of23bI4QEAK7O8Iv8Y7Tm0HBMU4Z0o5fguR4MQUpHHOAeE?= =?us-ascii?Q?Bp/CmUx9qddaYj3oF2uXtpKK04HkKOcaQISWwTrYetaYbzTRkitAW+IyYYCO?= =?us-ascii?Q?4W1Ccrcd8PlaJoOi1BLn/sKMpGzb+1MaF3cvvnEQRp8ZDoNASCgAVbrIVGFz?= =?us-ascii?Q?RTblchCPFjCcycIdhqjpDJkZ6IuWBKFsSypPTBn0zu1h5lpgWLtr+Aj8qOHl?= =?us-ascii?Q?qSG6q1a7tSG9euqjzUu0SfIMIsJaryXKy4qt8LhqsIl52uAca7dg69PmQj+1?= =?us-ascii?Q?LZQ4YKtqTqkI/Rqd3NqbnAD?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:aEv1SST8WciHSqKkAalTnXprJSBkVifQJmEmrt5kdfhEKO5yVgPaYHgLi19HF79zeeM4WpEzBFZJYEDTWfg+glNnH2bSuLynWJmwYbxsAsghyQoI8dwbYckaG7TUcT5c/pQ8yV69ylA29whjJ3kDwRK4ZnWGv1DRG+bjWj75RSVwfh/KmdCYzTOr34Se5CBJ71pNbjCz3DBSjYNJBhe2/GtiW3uKSjjTB+cNMcniKqOqlXapy3I05Igg+eGs1XTtWLpkwEagJeKLBF8Aaq5MHP7A1DgWTV1+JExB8/UBcgCaVAI2TsZV8O4b7U2MnRKqgNwzB2ErnG9HIWOe7d1qm59xcIRVglBX8Q0juzcyZWlsNLF5qdAiP+o/CduU73sqSrUW28mBYbfX7JU+TXMA4V2xwrOzSUbeoaaBqh5yVg5B6AinOrhU45sTMVF0j+8htNfskDiILbx9ttVXS+BIYIzEdtyOWCp4I+Zi8AjjPMHRF8mByEjo7o4thmM9KplaWcz8UJt+jfzB2Jywhw1Linh5dy6Lz8SOskqq8r7V9Hc=; 5:b/3+xrAno8SkIML1ZkgiT1d226cUcbH1LfHOix4vOrnVNDKjIZSC1RhJavwUOS9dgGCLAC7tQjaI74Emkb/d547Z6GeCy3ldcU/Wwe1Z73xqrV3AgWai+AkRRQtLol4Z3bFeCsuGvBGUlMDojTi4ow==; 24:gHsJNd3QwOeI3KbA7zAVubTrJff37erFztF3njP5FH21ovQfRkdJ59IpCF+VO7K2PkByRDFRdX7IZtaGif0HPpZBqw2E11Jx/n2naHadPbU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:NQ2+9xfREQmf7jEIKHHhveg3Fw9IAA6abn3SUhSk+PgiTQEsHQGNLV+ko3Ql6xvaFpGoZihaOX8u9m7yhw4+qXiNNfjRB+BuSl+gpt5SE8oGzgNU8+aQWq/Q9driuwak+lrDrBlwQTuEkMPyRnfhWl2GRdldjRl/C4DWXNH2ayIFEVdVE4BZjJEcCyepR05OE126FOctAV+8Oj5cNZQCP7beJw+SC/xtWYB9DBJtLH2oIHE84WPw+p/TTku3HMTvveBA8W8PtmVldwR1AtrSeYBsHBV3ShFyix5uRp4XjsBv/C0lvdWmZpwoNVnHn2shqk8jCoKSuyERtBjuniE3ew==; 20:YbXZCHMJIVuPXZe0qO2cPsEL8tsssPD+YKVtW3W7G2ockmzaBsEDqcJd8xFjiCWuFRJ1A2IGuXTtbhXLFiXpVjsbP1HTV0SdGja4dTCNfpigU8Hs6/ywVt2AUdIunawa8HfwDJwMLzrkRwR2nklTbcuvaVbvqo043nfxPzOTb/ZhniEGfUg5PgrtN/bq5ve5Ck12QpC2rxYGIY1TIyniyYiEJTKVSapSUlUBbIhm7AEtA/pIcdiHvJ72+nXqpCB9 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:53.0522 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [edk2] [RFC v4 13/13] OvmfPkg/QemuFwCfgLib: Add SEV support X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, leo.duran@amd.com, Laszlo Ersek , Jordan Justen Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When SEV is enabled, use a bounce buffer to perform the DMA operation. Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh --- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 54 +++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgLib.c index 73a19772bee1..86d8bf880e71 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c @@ -72,6 +72,8 @@ InternalQemuFwCfgDmaBytes ( volatile FW_CFG_DMA_ACCESS *Access; UINT32 AccessHigh, AccessLow; UINT32 Status; + UINT32 NumPages; + VOID *DmaBuffer, *BounceBuffer; =20 ASSERT (Control =3D=3D FW_CFG_DMA_CTL_WRITE || Control =3D=3D FW_CFG_DMA= _CTL_READ || Control =3D=3D FW_CFG_DMA_CTL_SKIP); @@ -80,11 +82,44 @@ InternalQemuFwCfgDmaBytes ( return; } =20 - Access =3D &LocalAccess; + // + // When SEV is enabled then allocate DMA bounce buffer + // + if (InternalQemuFwCfgSevIsEnabled ()) { + UINT32 TotalSize; + + TotalSize =3D sizeof (*Access); + // + // Control operation does not need buffer + // + if (Control !=3D FW_CFG_DMA_CTL_SKIP) { + TotalSize +=3D Size; + } + + // + // Allocate SEV DMA bounce buffer + // + NumPages =3D EFI_SIZE_TO_PAGES (TotalSize); + InternalQemuFwCfgSevDmaAllocateBuffer (NumPages, &BounceBuffer); + + Access =3D BounceBuffer; + DmaBuffer =3D BounceBuffer + sizeof (*Access); + + // + // Copy data from Host buffer into DMA buffer + // + if (Buffer && Control =3D=3D FW_CFG_DMA_CTL_WRITE) { + CopyMem (DmaBuffer, Buffer, Size); + } + } else { + Access =3D &LocalAccess; + DmaBuffer =3D Buffer; + BounceBuffer =3D NULL; + } =20 Access->Control =3D SwapBytes32 (Control); Access->Length =3D SwapBytes32 (Size); - Access->Address =3D SwapBytes64 ((UINTN)Buffer); + Access->Address =3D SwapBytes64 ((UINTN)DmaBuffer); =20 // // Delimit the transfer from (a) modifications to Access, (b) in case of= a @@ -117,6 +152,21 @@ InternalQemuFwCfgDmaBytes ( // After a read, the caller will want to use Buffer. // MemoryFence (); + + // + // If Bounce buffer was allocated then copy the data into host buffer and + // free the bounce buffer + // + if (BounceBuffer) { + // + // Copy data from DMA buffer into host buffer + // + if (Buffer && Control =3D=3D FW_CFG_DMA_CTL_READ) { + CopyMem (Buffer, DmaBuffer, Size); + } + + InternalQemuFwCfgSevDmaFreeBuffer (BounceBuffer, NumPages); + } } =20 =20 --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel