From nobody Sun May 5 08:51:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.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 1530817961465618.1079966587358; Thu, 5 Jul 2018 12:12:41 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 21A7E210E2DA8; Thu, 5 Jul 2018 12:12:39 -0700 (PDT) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0063.outbound.protection.outlook.com [104.47.33.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C3466210D7F24 for ; Thu, 5 Jul 2018 12:12:37 -0700 (PDT) Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:6f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.20; Thu, 5 Jul 2018 19:12:35 +0000 X-Original-To: edk2-devel@lists.01.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; Received-SPF: Pass (sender SPF authorized) identity=helo; client-ip=104.47.33.63; helo=nam01-bn3-obe.outbound.protection.outlook.com; envelope-from=brijesh.singh@amd.com; receiver=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:X-MS-Exchange-SenderADCheck; bh=cFTLUSkdJwyNg0dJWuVJMorkr3wmBzt+Xaj56Y9IljA=; b=whz9f1UdIoDdhhrOn9ALWhyX55ItS9Hp4/meON5osiw+z2BchzJBiQPFUb+Qa4oxXIkqp++ctDWSl84v9HGZCNs6XbnOHrmTqFE/Q+KM0ftpYhVarsDKLm2Q6EZGsPQL4ckh4mOB+qp/XAY8YtUl05AmYLaXI58YPTZxrG84yC4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: edk2-devel@lists.01.org Date: Thu, 5 Jul 2018 14:12:23 -0500 Message-Id: <1530817945-8030-2-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530817945-8030-1-git-send-email-brijesh.singh@amd.com> References: <1530817945-8030-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR1201CA0013.namprd12.prod.outlook.com (2603:10b6:405:4c::23) To SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:6f::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0692f512-e5b1-4fd3-6b61-08d5e2ab4489 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:SN6PR12MB2685; X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 3:vuV5mb/Fy+FJS1/hC94r04ZMpz8URxfjc6kuS83WbHi/zTmSKju9dRQyfItC9OtquWJG9FqoXqC1CXXz9auLKtDJYExbZizxmr8E1zz1K5/JhlcnePyOyeFvc4jzGUADda4t8KzKNdEXpUKGRD2irXt2UPpy02UNWY56B7/KDbT86PPlis/eQauI4Kl8teWPP7gzkNIYMNURj+1fRDCkBHkY8ZRSukciWsFtgHC/2Hlrcb0Z3ML6/ma5bAtCiM3O; 25:tbUOoFGK9J98J+z0wTOSxAHy2PY8wmiVZVVNv1vXIM1BKwrkYRb5LpSWeQZXY4L+GIKKZarXnu7O0xUMjaqEVVU77DUh+8UnX/eRgfARrbYQWjQoy/WycjrgZK3vNXcPNIY9QiZyoLMYGBY+gffqgdcV6O0kOvc1357w2jnK/m1GPEONowEXIuK6gdv+dtp28sQH/K3C3ZPNqnwmhj9YwGY4XQfWUAboxzsD0JV/4/w1OuXl8qLxlOje660Foo7izJIELBkPW64k3PMaMubSXyyjkvAb4LgMk56scRbs+pjqX6CoEaer8bK7lNU48V1wAO5AneQo7GtXZ6sczT+zSg==; 31:PpAfruA4tOp6tpyv9xrtGxF3WFMeRzlhEd/t93R2zq3P13jM8TJVFeg6O6ErMrBNyYBb/JdLpDSYahtWB4NkUjAxdX5GotzZTQDDWV5GFDqDA3+Q74Q/Imq9ztCGEaIpxLoB7afJzNDBoS06YnCX5BS2O0hXQa/JXrkrd05eQyJ6Iv61dKJWy/ZbglQJs587/WhYSlwhEs95CFDibLWEtWpVVChiij+TeZ6e4V//9I8= X-MS-TrafficTypeDiagnostic: SN6PR12MB2685: X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 20:mdoJdNqXlRG9zl97WRFRqOI36nHluZLSP29O/HnY7oBxsFwjAj9aH76BxA7r8/43Dz/jHfTlXY3KXqIIdmZE5fDkaxL+lbsNf4q1xYFo2NlZc7nSs4OkJ2PLctQ80AseCfdkmhCzuZD9KRfrMmsAd2S6X28DmUDgIb4hQm//qRNiSE1KpslLBIX0spsHWo6uNp2xm4HsxKHLwgjyHNp2Aicgt8fNqsYV5uGEkzgIZkvv1CgjRAcjE6NPITm908XCR7lrGeBK4as9tpxa4Fufyobpxsf+YfKB/ObUgpAP7UmVySF0yRWxb70N1F/5rtFgd0rPGLg57DNWonQUCVv60cHIWC2uLEUo21FPIvzNs9K4L60Kzfnyi9/jYsKRVyN06LJ8li5UaYb52XfECeNSJq+8SyEWheZzX9rbbHWYVVLzgFQWeF/CYUKDwKK37Hl+5vy5BSgs3aKljok6TEQlzMBV5Z9sXOrSXwrk1jYQrV6TmlB1Zkkx8rcR/gX+xGa7; 4:kLEa3Vzzlp3P859TVqqMyHOhCOv/9QsQQoteRQnxO5vgbMxg3JpKgVNwZa8fJuTGoSMOuqVjayQz2nmA9WubnbvAOwzO3+zA5Ir7NIAzbEfXQ5BRDKo1ckuJInKT5iGLn3n2emNb0S7qOoc2B61qR6QJKyUEAHDI60Fq+zYZCx58LQWqhkaMz6Br0NedSO+sTQWBiYnYuxOEM+n9pfB+r6I3FIKmN/4Yp/LmBhEbkrr3RhyX7IYLds+LbN0bd1Ohs7vnvv5+pk14fISw2b+RlsY8pBRioLiP90SRP5yd3ksWrA0WLC+iU557RV+IurI5qzcjwasfsQOc/akWH2sY9e1MxO+KrRXyS1mqgiWqHQnemGkieZS0vu06ZASv9yUU X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(70601490899591)(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:SN6PR12MB2685; BCL:0; PCL:0; RULEID:; SRVR:SN6PR12MB2685; X-Forefront-PRVS: 0724FCD4CD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(396003)(136003)(346002)(366004)(189003)(199004)(106356001)(105586002)(4326008)(2351001)(54906003)(50226002)(25786009)(186003)(53936002)(51416003)(52116002)(36756003)(7696005)(16526019)(66066001)(47776003)(2361001)(5660300001)(6916009)(68736007)(316002)(16586007)(6666003)(446003)(478600001)(53416004)(8676002)(86362001)(6486002)(50466002)(2906002)(44832011)(81156014)(3846002)(386003)(2616005)(476003)(11346002)(956004)(81166006)(8936002)(48376002)(97736004)(486006)(305945005)(6116002)(76176011)(26005)(7736002)(213903007); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR12MB2685; H:sbrijesh-desktop.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR12MB2685; 23:j2aQUmsml7kz55+LX+6fym4Idnh4ZAAo3tguUglt6?= =?us-ascii?Q?muzw6ofds5CsAyRU1GU3zVswrN5abG8Z86iOmi06xIgbPssvE6/dtTRqdlXG?= =?us-ascii?Q?opCJNxoDx6O6M/XE6uo+TdDTK4qj00psyi1p5rYvRCCG4PikgEUYAhd/neGX?= =?us-ascii?Q?DlHSw05vjul91mKotbQzRQ8x82sLzf161XZ1xKbEDcrLP1I4QLVonPeIpXzu?= =?us-ascii?Q?fVEx8t9kqxK8ury45WyY73mq9t3mE3r1XiU26n+TTwwpkANDPqNDUOaEh0Uq?= =?us-ascii?Q?8Z/hgGxia7GxH709RcZNAMOQlZd9rDqgMK7w8dDOyY2pIioJ4g3ni76FvWDJ?= =?us-ascii?Q?aQIOMbf9EHjeJL/egeNbZQTKsvC97e+6KKk5nU4NMp0hvc24oJxCSaXrM3yi?= =?us-ascii?Q?xMfqBotUVcLh699riIiieAIjfeuIxChEczbk6AyQEHxffcMHpRxym2zU0I5e?= =?us-ascii?Q?tA2WKaqa71K34BIFU8A15e5osibPL0zxyoW9v7nVclagAyaVIDje8rNJVTr/?= =?us-ascii?Q?uKDq3AhKkA6M36mPq91WGnKTZp42bOjdr6e/3b6NAh+iAgFDuTaAUZXdoxHu?= =?us-ascii?Q?xoICKSStY2wxOXoIl4Mx6LxECVxKCG4Ru350Ly0Vdk0vFKfL/UDUsW9U+xN9?= =?us-ascii?Q?k1Xkbfgit2PyrNOdkyKCL4gwTPRkMVgagrCg48akNpUbWf9/rbAQf2MujOSI?= =?us-ascii?Q?S6iE+Am8d7pfGFSevZjr77HW8JfqxcrG0ZIrEl5XpSmgIMUcSNtxvuyOJ5Lp?= =?us-ascii?Q?3L7Qsfpsw70ENj0IBnlvIwpXQzfpj/X9H88h/sa5tEKO5Mc0HTtCFB7P0Gju?= =?us-ascii?Q?3eLWkmP+gkgfZ9tm9iYCZCYIFqVyn6RorHPOY+W340W9m1FeSjXgWki0q17e?= =?us-ascii?Q?AyUYpmJXg2DgiFJsCTJ3CkZlYxS2Fq0YAtnBwNYacvQur9N2xNPT19RREwIG?= =?us-ascii?Q?GAkfsfqeyYqgtuVfedgWyOZSel6feojIXe3N09LdG8aNVQ+me+So67YDxJTp?= =?us-ascii?Q?gsDiNPk6HMSU7oDF9GITk/9rAnbazKC84JborOySHgETSkjX1wYxfyDnTCdq?= =?us-ascii?Q?I7yVG5FWnMB8FbvqnXisI1RZOphY+4Ulvc2Px0upfgyU9KciR7REXpzwfzb6?= =?us-ascii?Q?S42jo2HkyTrH1fzWkuyuf/zEwKIZLMGnIecDf9y+pGz21afY7z2wetljd9ik?= =?us-ascii?Q?79c1QtCd6dbrY9eeatVOzNOlaVvpGA7Stx3zqKO3UB7+zDK3b4hzOGTYhhJn?= =?us-ascii?Q?TBt0BuwuwjQdLU4Oat3aDzUlVCh3P6mmFNp/tH8?= X-Microsoft-Antispam-Message-Info: ARZnrhFSWfnJYFeOsqcZBY4NG3VTPQx5ZMoWD/fvbLAt1kjOvxc+QEMkGNPYJlPikSSMaBY+y0mGSbUEvFMwMxHhyN8DP0TgfrK8PYp3cUmjl67ajOykCeS5qItF7SkUNtOt8yyPiSk6hAm5zmSYxoqtoORjNZJSvCWSYpuhZkmW6i1Fq9Kmqtw2elmwKj13afMh2XR1INXmsY7ub7v7UVzfUm+K+CgKNMa+wGH58Bj6w295KuiQryVAKnKFLeru6dPkIfUw3qZOwBD2RCk12QcRc2+ww5e7YBuampIsf1RormOqoPv2Miipl13ZaHhVYSe9QL1+Vtug0CmmBkNK/3kwIOXIBekrjDKLEj4yDAM= X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 6:B3LdrnKgxPyM+FU7YwoRPK8J+pxAd6hFbbENxW2uy5fUvcQl9l0fgFejUxeKx4biZOJeZ6V0wbXtSjihUR9oMtcQHYbcANnP84vDzHnz3/3d9dLdb5jrsm+HTNGJx6/L56577zxWl59AZKqtLBtwaNQMqXE7GIWog+TrSxvCTKSimDRxYGx3g1xosgANN2kTnpbI5Iq7EhsR65vSY7MBHBEHmzgSKn9cok8BRmTVwjWv8GRzG2yyJbRt91A+xVYW8ipcvSl7ung8xjNnLeQJo+vvXWB4s31EQp2JHVGP4bTAw+/JGppL7rSnSlaUoL2jEf02ZJhyw/D55Mz7LKooWPkgbXyS+jkuwUyIFcENTveGhUa9gQM7XZAFwTlVz+T2DkqT8a7uhcYq3hlHb0RaLWrBWb5awRZ8TzSS7qqk0iImkV0pMec6RIBPv94iqQfmOsO2dnu/vfb8Ght7HNVAig==; 5:M9LQnOdzSClDBF5eNe2ig13XyhmqPmexbnZQe7FRVeYOVXdfX9gjpvnmyNCFB5fZ7fFt7Q3TIC61lmp73ibJV97c0Otmj+dCm+Akq1t0pOjrTpJTiT728OPEYuctQfPfBP886bdPT7Xh1rBnnVXvKwT0KNaOnayokXKGpYqb22o=; 24:zltB2HO23RarEOeJa1vNgjOKX/f3SG6M2HfWyydgDIrjBKdnJCBCMUUOHCJMSHyN8l0cqCAVYffo0xrViUJ4+z++QSRY1xg7SzR4f4Wg8Rk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 7:xQ2T8YS6ryXa96QE7FUQOzRgx10sStPszGcqKQXWGGBbJX5b7O7tQhrP/LKY/FkEN8eLrw1Y2jceOsSsvk0kwpSluxbL9pFeYApsD4I9oI1mFLvnqGnpkXqPjC+NBnf+C4IjCWCDSVxfoGSZ0xMqRIr1+2bJIuCW1K897tLBHUExFggzXtfz6MvN/h8V+pfjbvw87Pf91tDNM1je9xO31+JnHPztiY41YlTWVU9um4V5FjjJVrO8o6NMDPVlshK0; 20:Ty19qWJG6f4AR7glYZSaG593KeqDWCIZfkqnooatBc/K1vyVKP5+jNSdCIdVNAU7tw7Pks3wc4sf/hLNy/dGxdEFiS0lEvHpn0Mjh+TzV17yOsiPBMEbdtXN4XAD4/UAZf2aVAe+Fnjmy0IbKqCvdRNLu8m60INDUp7tU8h4FHUrFDsCxJoNtki8r26FBHPFfANF6cP1OcPsufPzDm2aU8U49Ou/WezpQcctehYyClXmSva2CagO98eKlYHhRcEu X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2018 19:12:35.2669 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0692f512-e5b1-4fd3-6b61-08d5e2ab4489 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2685 Subject: [edk2] [PATCH v3 1/3] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: mark Flash memory range as MMIO X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lendacky Thomas , Brijesh Singh , Justen Jordan L , Anthony Perard , 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" The flash memory range is an IO address and should be presented as Memory Mapped IO in EFI Runtime mapping. This information can be used by OS when mapping the flash memory range. It is especially helpful in SEV guest case, in which IO addresses should be mapped as unencrypted. If memory region is not marked as MMIO then OS maps the range as encrypted. Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Cc: Justen Jordan L Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Brijesh Singh --- .../FwBlockService.c | 28 ++++++++++++++++--= ---- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/Ovmf= Pkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index 558b395dff4a..28499991a43c 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c @@ -831,12 +831,13 @@ ValidateFvHeader ( =20 STATIC EFI_STATUS -MarkMemoryRangeForRuntimeAccess ( +MarkIoMemoryRangeForRuntimeAccess ( EFI_PHYSICAL_ADDRESS BaseAddress, UINTN Length ) { EFI_STATUS Status; + EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor; =20 // // Mark flash region as runtime memory @@ -847,18 +848,31 @@ MarkMemoryRangeForRuntimeAccess ( ); =20 Status =3D gDS->AddMemorySpace ( - EfiGcdMemoryTypeSystemMemory, + EfiGcdMemoryTypeMemoryMappedIo, BaseAddress, Length, EFI_MEMORY_UC | EFI_MEMORY_RUNTIME ); ASSERT_EFI_ERROR (Status); =20 - Status =3D gBS->AllocatePages ( + Status =3D gDS->AllocateMemorySpace ( AllocateAddress, - EfiRuntimeServicesData, - EFI_SIZE_TO_PAGES (Length), - &BaseAddress + EfiGcdMemoryTypeMemoryMappedIo, + 0, + Length, + &BaseAddress, + gImageHandle, + NULL + ); + ASSERT_EFI_ERROR (Status); + + Status =3D gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescript= or); + ASSERT_EFI_ERROR (Status); + + Status =3D gDS->SetMemorySpaceAttributes ( + BaseAddress, + Length, + GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME ); ASSERT_EFI_ERROR (Status); =20 @@ -1091,7 +1105,7 @@ FvbInitialize ( // InstallProtocolInterfaces (FvbDevice); =20 - MarkMemoryRangeForRuntimeAccess (BaseAddress, Length); + MarkIoMemoryRangeForRuntimeAccess (BaseAddress, Length); =20 // // Set several PCD values to point to flash --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 08:51:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.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 1530817965129265.5377151601675; Thu, 5 Jul 2018 12:12:45 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 598BB210E3DC9; Thu, 5 Jul 2018 12:12:41 -0700 (PDT) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0063.outbound.protection.outlook.com [104.47.33.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2E2BD202E5486 for ; Thu, 5 Jul 2018 12:12:38 -0700 (PDT) Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:6f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.20; Thu, 5 Jul 2018 19:12:36 +0000 X-Original-To: edk2-devel@lists.01.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; Received-SPF: Pass (sender SPF authorized) identity=helo; client-ip=104.47.33.63; helo=nam01-bn3-obe.outbound.protection.outlook.com; envelope-from=brijesh.singh@amd.com; receiver=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:X-MS-Exchange-SenderADCheck; bh=LBTOsZhctFCkNDM05h9azTqhZSPbT9vtDXtEJ4nVIZM=; b=bM/ja/inSuXG6Zn57G+vVqq5sb41QnBB9I2sVF92ZwlZYy4+w6N2/ZUoDGjCUAk2Wpv3lxUNn24kJweSRshXSxB9vVoU9gPA7NICGr+ucwcT4LPoc6/hHKjnpl3euLfWweUlcmnJFUUjzRW3Do47HQkPh6OiTVCa6JdA7ZDg2yM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: edk2-devel@lists.01.org Date: Thu, 5 Jul 2018 14:12:24 -0500 Message-Id: <1530817945-8030-3-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530817945-8030-1-git-send-email-brijesh.singh@amd.com> References: <1530817945-8030-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR1201CA0013.namprd12.prod.outlook.com (2603:10b6:405:4c::23) To SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:6f::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a46a9bd3-1e7d-4992-68ff-08d5e2ab454c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:SN6PR12MB2685; X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 3:uAug0PNdWwMtmzfTfmDG3pq4mzQLYOtQIV4C4IjbGzwyMDc1XdRROQSPy6zq346fFa/+Eg5oqJ1M4evk0x2l8iohzbRwa5Zh2BoHmjyLVxtLHy9uMlav/lVqIMFvDPO4TrQJxgUL5VB1FaZLKBgYfFU+va4GEpRgJLXMAB7BnyIYO8OEsK49cykWDeezRWBqycugKMCO+OOZDK5k8362UI1OKblsUAHSaYGVwYx5qlFJyAHx97Z0wgCJJ203Mr5I; 25:Ab2c3wjKree5ZWGlBllut6LidFlRGqB6ca2iQDMHvnLjEdz2H+t67Ghjmns2XWcyDOe8S1WJ3fMnNcAkH9TMm/x3JVFn/Mpc+hbH/qZlwt7YKIfUnQ4KKnxWKNvQf5R0DpN6FzG/bsNWd61RG+6G5eQTTKUyeZie/CkLb8ifPUaija1waoq9V9OayOmr7Oc2EKWxGVToJ+GIhyRmZT14dCKwfY3sTB+9f082GGQo+gILkqA01rXNF1/kMXE3//u0UWHM5fSqsUWu1yCJuBeHDaS6i2L7M+5h8uIhtY56CcRJc9yAzSH27ZyNzkfaNmk13vdxBb26Yv1TSDtvRQdhUg==; 31:3JxTOcPcfqFMaomZvFelJgyccLKYp0FuJIR9gDd3FC38xU8dF8LHybKFVm1lniCwqGad9MuM/AB1QGdicozoDqAHoI8UvlMJGBvDJ9Uhj/WdFqc4UXp0qVuR1LV9JVOFyPKODrhEeyyG0T++CLpfNjbEaGr/O6yDZBqrQf8Op89KOxd9pnkVCCRk4+q8WCrzau5XR/i71COej/Y+S04Q+e/13yfUPXLMkjZ2AlSCwB0= X-MS-TrafficTypeDiagnostic: SN6PR12MB2685: X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 20:cM4OTBgKBtCnXVkdqzSnDbStiWULhrezhN8j3pR4gb39NmPOp1k0AbmQC8dqhrXYDwF1Dt+aTJoIU7n4AFKqY8UtYKeIXCUtRDqh6P1ds4rf+McUG8sIvpMdxDFhybL7nef1rM3ioZv1tJB6RZde5xbUpn+9qPjmesva3r21lG/y0dX8ZuRBm/NXr7DCZUpSoIKh73RyO9jiaXMBJgt0EWsqKuAL11Ajf67PuitQDavbbT9Ejy3Qn1VZciPsZDxRMcAPYnMsrRIHPWEtNnF3UQw1W42wOja3wI7dNL+id2i0k29/om9rWAmMP9Af7CCDyBN6aMz6iLhX96A59TX0iCLRrzj5KXggWc8+wkChz2ogV/cng+DegsH0CNyd4C4zbQq8qNjeIlnH/qlI98+poceHdLYwqeQK/Ersbj0n7lVTO616wwn+3zQiMybs6SjbQzmHBcPR6skBn+4W4IEdbF4mtKoPK5Wq1DbWSQ3ZimViUOzcSQlC0KIJmmnQE14/; 4:+L9cpiaSH4tWLEtFtFBE64KAChrgMXZ0u98P0bqLG3kVMzQm7/yIh7p8jP9HvlMOfwiGmO1pkAlpyO4Ppz/7spYSmA/27XmW5Qf2Dsld88+A2C49IMSUTvQyu5YjuQ+RZywY5wyRo5hW2whoCldmmNihIeN9dgrhGjKztIsQ0W/ZivLtaGLbFLliX9urP9ALutg+GBUzPZWUfmHRCaKsBUgtYGUWf34mkOD7omJm/tnHekd3kSMI+Ejir9qaikVdKh1/kptpASm9ps59R4pShziTCjkGkXJrgBPKh2ru/FZpM1Y47XnWHEs6MVIpbTB0H3Oq/Z0ckVVtuPvO9QbHvYodfv6j64lQuWI5xvEXHXDfIxqay9qw20U50QVRekNY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(70601490899591)(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:SN6PR12MB2685; BCL:0; PCL:0; RULEID:; SRVR:SN6PR12MB2685; X-Forefront-PRVS: 0724FCD4CD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(396003)(136003)(346002)(366004)(189003)(199004)(106356001)(105586002)(4326008)(2351001)(54906003)(50226002)(25786009)(186003)(53936002)(51416003)(52116002)(36756003)(7696005)(16526019)(66066001)(47776003)(2361001)(5660300001)(6916009)(68736007)(316002)(16586007)(6666003)(446003)(478600001)(53416004)(8676002)(86362001)(6486002)(50466002)(2906002)(44832011)(81156014)(3846002)(386003)(2616005)(476003)(11346002)(956004)(81166006)(8936002)(48376002)(97736004)(486006)(305945005)(6116002)(76176011)(26005)(7736002)(213903007); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR12MB2685; H:sbrijesh-desktop.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR12MB2685; 23:ykBcwERZ8SKiAWU5f/t+xvSVbrq97OCP07uANfZ7Q?= =?us-ascii?Q?y+4Jp4452DprvnnfC2Va8Vhino8jfq1B6OA1iK5hl7ANpw0K6ljsnNtSGeQx?= =?us-ascii?Q?6xXTKhgMwevt7lCtwiCB2Jhtabv60qbjQnZROg2ir+aFibGbppF5h/sovRT5?= =?us-ascii?Q?M7YK2bC87pqEJVsyTt0qhwCgVJ0HXruNVvDh6M342D3U71LkxM+ZnXQy6qy4?= =?us-ascii?Q?C1n3OOjhHsa4pFFfqDWu1khUSak5QwcQPn6Q0ry9ZbkJVe9DAbfdD9YNAEpC?= =?us-ascii?Q?xmSIsPRcQWJ2cv7LPtFP0TEQe6QMjUaLhXEeQ05p8/ZwNHuejXRb9OXvapoA?= =?us-ascii?Q?D/Z0J5pSTYqaoDkAiC9Rm9pOzjZ41i4DxFfGLV05GeRfEwCJHsnhSPUU7QTf?= =?us-ascii?Q?XmgfP2Xrzvgn3PhG3rJh+dCnGflGOVODgocA9FXwb9OnsfZe4Vd0VH9Thtp7?= =?us-ascii?Q?oDkFLjj3ml2tXykmskwm0G0yOfE8MAFJD/uPcNMFQDE7RhBAYRLQHmknVQX6?= =?us-ascii?Q?S7Gx3yN0KBsQOkD6t6/dVHTGkFLKTCa6lP1Knq00Ur+8s9SBFKbSnMzL5d3y?= =?us-ascii?Q?6mHIOqtCuEv5zv7kMTr9oc9dJaVDK3fxpy9IkRUATKNomvR3le9lGsolN/3s?= =?us-ascii?Q?EEYfFTGhwAmQ8lYbuRt/J6KUYBVomRoCieyC2Snjilm1gLQH/fjX2iyzZA1K?= =?us-ascii?Q?yAlbR3O6MNTU5zrCWcegmN/9BeeRPn7e4eHNrcqtffk2KoRmCYSbIsWuBQII?= =?us-ascii?Q?g3muvk2vbdF5iVvg7Uqxot5s1k5isQ46brMRh1R4pdVc8tm9hlyicHfMRUCt?= =?us-ascii?Q?CuHMDr/f2jLmDk/0ORl3YhBni4r6VhMz2eCn+6xGDfULTRm3ytjFhDCPP4ok?= =?us-ascii?Q?7z26OL4vzdatUZm0jXcQjwcC7lvnEE8u6emyt5adQRxMxNOlK1+Yh5cdSzuL?= =?us-ascii?Q?Co9iFkjwrpcTyWnOXMGuOu8cCIj5McSQMlgf53J1+gGmyLSZsWNfHxq56Y6l?= =?us-ascii?Q?7CNPEOled0eHFsbz8WbvM8B8a6x4iX3R9dNxty+d+6p4/RNQP7lI63zNPaET?= =?us-ascii?Q?WA57QnPlcZDHeFelw0W2ty8aD3zWSimQZ6j32TA97BWbs9TS2lvfBGD7mNJn?= =?us-ascii?Q?o97V/Jk7faL3gsObHUw4dTGwFE42n04jPkdkVyMDp3FUXXhU9YxUvs5fe0HU?= =?us-ascii?Q?PjXHtb3X1N9KLRaMJJRJ92jgyonaWf/Qdv8dvMVx2LICBB0RbsZTUoWuOXOA?= =?us-ascii?Q?QS4BPQ2Qgn9d7dEmm+pneFSaiprUVhOYcNzankv?= X-Microsoft-Antispam-Message-Info: jPhb+JDjIszWtO39AfOQA6aPWNbtJjbkpkQZtTrYUuuDpXA8u4IjSLS1X4L5PeZY90ziqafu9HLqP0Awbs2paster353l5jhfK1e4ljURAmgIBjyAh0doOwU6X2pwOm/VrgjmnN81Lfx2tIvo7/NbvRxsVyW6BKLfY637Mo0T4V0xWlQEXxDzFgYCsu0HEDt7ACZVSseFNS+gpZDHKU7G9GhQyJHiv1yhTQdiNkyah05wdDwi/cDhOb1d45vDwGACH1csLcdR60HbPsoVkZkmwbi/7/iHYSoETj/3mTqPwNOSevYJCyGRQZcaQ+yy3gS3NO7N8xvFdyi/+Egh5g1nV3JUnUnv+AXHCUFadx/a6A= X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 6:aMDfu0DQTAQMHKcZ6Ev2jYdyC4zARMWmrI3aeAFArSynwTyP+idT145VGaBec1QVwbxn5/hYMLnUfQ3SSwMVjcQGjZDEUAzLawr18ACicDOE4KzrUj/6PmcLpAyrehwhsx84BYcqpKfNvn+DsygBPgpo77H14IcQtrgale9uRwg5wjSoVtrsmNvvlvko19UVdyI3QJLuup3KjH2ST0TyJIIA93oO/+MLmRu2TTUXYHl1V8mxjObKJ2XyZkUyvWCxKpwuPtDRd6XLlNrgGq6TUQqnLymF+UhVVakzwcohz5FqGkc5PxFE2ByXhvAJwtuGK1qx5zdFexjf3UBsF1R1m5626AMMiSMM3geD11plFvCE/XbWgiuvA3hyGuf5PEWQ8V79bU15otY6EoAgXzPzeZEyM70kbCSdxoOOZGg1CXq00obKV7+lgv+cHB8+L62gTHi7OxF5wGhaeTI1InkfgQ==; 5:VaTWyFcAqSj9ZihwpjbItaX1E41amFzATwZxSQI2bHWoZ+7x2zP4ltE7/nWoM2N9d+by3Ul8zZXHXB4S0rqJSipgJmLrXTo5YO1cZzJfmq9oBbUSwCkK6L9BQ6kiLPqeVt7RAY+FcUQcuycsDxxqga/qZhuWQVngVv/2c4BpIR4=; 24:RAhV0hfi2xETn5YVD76LgKfQWeD+5csy1np5MkX899P6JQ1R7viRgTZEE+ltFb/+JUcD6AGhYz8th/kMl0zd79JwSv9nkKVQzqa5BBqhmlk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 7:YU6BfvVOs/AASWMDd7lf8JsTJtN15lEPdxacZlsB/i6t1vlc+dlz1vdjBgc3La8TyUeNnIatGD7520hm3fxWbWrqF8ZvFieT4DT0pXFWNoSWTmVs+31hs78UwLIE+XcE3oJaW4mgxQqo9RuhOf8jnYj9PO0KxV5RfpY8rtEAf8atoSWJu+Rxo0NV4rtdLXxLWvrIjkHFC3yDgYdZu3B7gT0kKzHIUnKIIeiiv6bWumGcLkn8dDTRNgctjcSuJTs0; 20:3N/xsztKxvfs6uSaCDXWuwTak7v9R3UJ+9rXpUgg124N4kQax85UnNh1WeaJ2ZlWkm8qsEweX4bazW7G0ngvZaC44qadaP8YYBKs7BaIqNZhdIgQguIOEdVHRwSjb5aKgVtcszXec1cA/7qvz4hqmEhmTMjUkblB5HXTM4jRlplf7+lvAvJ6wC0FumPIJD0eeQXHlHHf0MUfGf0s7UbkFmK89LDHlB+ioSG6+eVO7dOiJtbiCEKR0nvNAJUFFRKK X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2018 19:12:36.3307 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a46a9bd3-1e7d-4992-68ff-08d5e2ab454c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2685 Subject: [edk2] [PATCH v3 2/3] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Do not expose MMIO in SMM build X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lendacky Thomas , Brijesh Singh , Justen Jordan L , Anthony Perard , 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" In the SMM build, only an SMM driver is using the address range hence we do not need to expose the flash MMIO range in EFI runtime mapping. Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Cc: Justen Jordan L Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Brijesh Singh --- .../FwBlockService.c | 50 ------------------= --- .../FwBlockService.h | 7 +++ .../FwBlockServiceDxe.c | 51 ++++++++++++++++++= ++++ .../FwBlockServiceSmm.c | 13 ++++++ 4 files changed, 71 insertions(+), 50 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/Ovmf= Pkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index 28499991a43c..eec8b1b1ae9d 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c @@ -831,56 +831,6 @@ ValidateFvHeader ( =20 STATIC EFI_STATUS -MarkIoMemoryRangeForRuntimeAccess ( - EFI_PHYSICAL_ADDRESS BaseAddress, - UINTN Length - ) -{ - EFI_STATUS Status; - EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor; - - // - // Mark flash region as runtime memory - // - Status =3D gDS->RemoveMemorySpace ( - BaseAddress, - Length - ); - - Status =3D gDS->AddMemorySpace ( - EfiGcdMemoryTypeMemoryMappedIo, - BaseAddress, - Length, - EFI_MEMORY_UC | EFI_MEMORY_RUNTIME - ); - ASSERT_EFI_ERROR (Status); - - Status =3D gDS->AllocateMemorySpace ( - AllocateAddress, - EfiGcdMemoryTypeMemoryMappedIo, - 0, - Length, - &BaseAddress, - gImageHandle, - NULL - ); - ASSERT_EFI_ERROR (Status); - - Status =3D gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescript= or); - ASSERT_EFI_ERROR (Status); - - Status =3D gDS->SetMemorySpaceAttributes ( - BaseAddress, - Length, - GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME - ); - ASSERT_EFI_ERROR (Status); - - return Status; -} - -STATIC -EFI_STATUS InitializeVariableFvHeader ( VOID ) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.h b/Ovmf= Pkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.h index 1f9287b08769..178f578d49f0 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.h +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.h @@ -189,4 +189,11 @@ VOID InstallVirtualAddressChangeHandler ( VOID ); + +EFI_STATUS +MarkIoMemoryRangeForRuntimeAccess ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINTN Length + ); + #endif diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/O= vmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c index 63b308658e36..646427bf4e2c 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include =20 #include "FwBlockService.h" #include "QemuFlash.h" @@ -155,3 +157,52 @@ InstallVirtualAddressChangeHandler ( ); ASSERT_EFI_ERROR (Status); } + +EFI_STATUS +MarkIoMemoryRangeForRuntimeAccess ( + EFI_PHYSICAL_ADDRESS BaseAddress, + UINTN Length + ) +{ + EFI_STATUS Status; + EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor; + + // + // Mark flash region as runtime memory + // + Status =3D gDS->RemoveMemorySpace ( + BaseAddress, + Length + ); + + Status =3D gDS->AddMemorySpace ( + EfiGcdMemoryTypeMemoryMappedIo, + BaseAddress, + Length, + EFI_MEMORY_UC | EFI_MEMORY_RUNTIME + ); + ASSERT_EFI_ERROR (Status); + + Status =3D gDS->AllocateMemorySpace ( + AllocateAddress, + EfiGcdMemoryTypeMemoryMappedIo, + 0, + Length, + &BaseAddress, + gImageHandle, + NULL + ); + ASSERT_EFI_ERROR (Status); + + Status =3D gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescript= or); + ASSERT_EFI_ERROR (Status); + + Status =3D gDS->SetMemorySpaceAttributes ( + BaseAddress, + Length, + GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME + ); + ASSERT_EFI_ERROR (Status); + + return Status; +} diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c b/O= vmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c index e0617f2503a2..cdb073348158 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c @@ -67,3 +67,16 @@ InstallVirtualAddressChangeHandler ( // Nothing. // } + +EFI_STATUS +MarkIoMemoryRangeForRuntimeAccess ( + EFI_PHYSICAL_ADDRESS BaseAddress, + UINTN Length + ) +{ + // + // Nothing + // + + return EFI_SUCCESS; +} --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 08:51:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.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 1530817967989778.4663608478932; Thu, 5 Jul 2018 12:12:47 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8A030210E3DEC; Thu, 5 Jul 2018 12:12:41 -0700 (PDT) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0046.outbound.protection.outlook.com [104.47.33.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F18C4210DF778 for ; Thu, 5 Jul 2018 12:12:39 -0700 (PDT) Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:6f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.20; Thu, 5 Jul 2018 19:12:37 +0000 X-Original-To: edk2-devel@lists.01.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; Received-SPF: Pass (sender SPF authorized) identity=helo; client-ip=104.47.33.46; helo=nam01-bn3-obe.outbound.protection.outlook.com; envelope-from=brijesh.singh@amd.com; receiver=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:X-MS-Exchange-SenderADCheck; bh=X56Ht2q/Pmbxtom1Ca1V7H3fQJD7wcxpiR67CtLZlJY=; b=Q5a153tesnaqhIUCuw3kWLK8yAvjCecibhbYbi3QwAKczgXv6zvGDEDB8V/ciFWrqnMER51TkpKpEg4bRFIjBMQULKq2UhJnul5Vfa/wyI1viuDaDulmiSZpydGt90w5a7dg8UUo4hae5TSWFeJzzgL81XRlHHOU3zAN7qQL35I= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: edk2-devel@lists.01.org Date: Thu, 5 Jul 2018 14:12:25 -0500 Message-Id: <1530817945-8030-4-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530817945-8030-1-git-send-email-brijesh.singh@amd.com> References: <1530817945-8030-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BN6PR1201CA0013.namprd12.prod.outlook.com (2603:10b6:405:4c::23) To SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:6f::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cf20d36f-429d-4046-b96c-08d5e2ab45ee X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600053)(711020)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:SN6PR12MB2685; X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 3:MbTnacL0iL3P3arkt1q4Yd9RjIYQN/CPSU1YaPAfbnSOtwr2EUB2ds9+HpEyWNizh93SCjRNBeHT4m3v46p8pdJh049Mt2w3Nt6IasU6N69zDQ2mV/ZOwETZqbq4FzzC8ecR4cQcVPtLxgbrTGB38LAg+Ri9x+bDD43xjynjRSMtb82h/WAkN3g4SkjBqUqAMFuA0dLh+KSNN3iRbh4F4cpVCky09/yIbXAEagNSXqZCqVy9EUxbA1/LxXu8ibNe; 25:JqyDomw0fzkh7tZVgGT0Ujdjsx4Obz4NNzDbPlfnW7GcyVSJPL+RNhIsUJ39t20RbYmsl9CW1QwEOeiXyrigTi6/7fbbwG7ik6rbyjbPPuqLEzRpV5V3G7lmokMztEM6QNiSQkCg8icDqm2JTEUaLl3UBew6nhkBmTpFKCQLkZJ/yRY+KrbfXYq1+zZWTC+8M1Qb4pHOXMbfYJPkhhqVRWfEHOjgHcqVrQMHizePzQhQXCPRgNiszRgqe8bzN3BaDqxqkWMqvuBIX3mn6vOuaEbEg28wCuGQ6ZA2QhA7TTEaF0uDRaUnn7jhnDGX2ohxUN4dTiO9OoigxXk6RX8V4Q==; 31:BU9SlGj1B2hGnwZLirs+WqHsw/YY9xqHzxl5L3O+26gDEOEKL+o5U0XhsLntO/hh5LqbrSryvIfNbFGk2h+1JmRmKAdv+qr6V2nYklsqg3STrPD2XOi+vCLAfY2bC9ZhXoTqXHLI0aQ1maOYAHQ5Uvj761mjMI/T07B+hGh0w3EOnTGX6q1VtWNCxn7HGBizRMkg/178Tg7oi0vFTQBcWZD50tb089Ugjd8kIDimx94= X-MS-TrafficTypeDiagnostic: SN6PR12MB2685: X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 20:vSzUNnRKnf8qFrAdRMY3yTaqw9KpLeHs1I1C70kXbB5zp3Ba1P0l9P40i2RhFkJKgnsz8pR70ZVgZHBb8D3BTb2+YwKgZ1edZZzG0b/OdPTgAUl3QfBCZIuXPfgjJ6QS7J5ACFU627V1i1XoTwC3BO88STZr36N+8xj3KforezmQYGZ83Ld34se8YQkUaZ4bpwp1gB3XwBf/gDWLqkv3qdegGDaq0QCTBmf8DezI/ODudhoP+KM9ZKTY1Mhkdi3d5q/aDUr5cUqZBrQYj501/LkQ/WVc0hBbMfPJjVEdgi32XgjLLIhsogm5Mv0FGsBBh58SkPVymAurzVSf6z4SB/i9BJgymz6cc0inNGvZHvmTIu3d4NiMabAlkV0YOgbEYZUDfRC+AdK4PfaYaZKbUcFcbr6Vq9KEzD/zVHoTJ/o8UQTQsDS5YC5GiDeTatE9CjKvpsx7V9h0KMIkHgZl6nGINqliPBKAr0c8ioQcPi/Hf+KSo7VU+IudH/gaTJci; 4:9BpxAr40NxNfUQSwpmCC/ub03HtDF+FUJzYgzcE7MH3xcENa+YbCqmyEKjdiB6tQ+SaLr9pXP4FgUlBgsPXe0sg8ChU9Gn7C0LIkABWtQXfInQ/32vu5ADF3Glz1LcknWCR/S7BrDMu+hONfDYSl73SdJ1hvQ/CcSuP+ZzozPiCUDRcJxT5LI5LdC8iDky8VpEgCwbv2UAEAnPBaAvBi2RW923R88a/qHbr/tH0UGolmVd7GnDQ6rhYXh5FpMgdny0dihvtJR/Jdoxsg7YbHC3MNH51ycTlbguUj5Tp7eIYiY2uZa8Y2mt0JPvqy0WmI8zYw+pVDfvtEl2XV0UDRKXLamuYHc6jOhauaLSEy4hiGIGvE8HfiuPKXvmEGNL+/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(70601490899591)(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:SN6PR12MB2685; BCL:0; PCL:0; RULEID:; SRVR:SN6PR12MB2685; X-Forefront-PRVS: 0724FCD4CD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(396003)(136003)(346002)(366004)(189003)(199004)(106356001)(105586002)(4326008)(2351001)(54906003)(50226002)(25786009)(186003)(53936002)(51416003)(52116002)(36756003)(7696005)(16526019)(66066001)(47776003)(2361001)(5660300001)(6916009)(68736007)(316002)(16586007)(14444005)(6666003)(446003)(478600001)(53416004)(8676002)(86362001)(6486002)(50466002)(2906002)(44832011)(81156014)(3846002)(386003)(2616005)(476003)(11346002)(956004)(81166006)(8936002)(48376002)(97736004)(486006)(305945005)(6116002)(76176011)(26005)(7736002)(213903007); DIR:OUT; SFP:1101; SCL:1; SRVR:SN6PR12MB2685; H:sbrijesh-desktop.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN6PR12MB2685; 23:taxWiP5byZCSWvLtt9n9xlQ1/4WZ8xFflaku3J9eA?= =?us-ascii?Q?Fg1WugBSj+jHMvc64m0Ix+H80fr743bGq2KpKYIXq4Al40dq2Xh3wwjWRP4Q?= =?us-ascii?Q?L6Qjvva6sbpxxgge64dX8gVM1JvuvHhwDrYlPbm4OaZdcb2EuCozIQqhpHGo?= =?us-ascii?Q?aqk3TrRBT5uxhecnFXOaGQgWDdf2qBRUGbpLCzCbToHUuEt2OQrqq4tVTCT1?= =?us-ascii?Q?3ysbf5M1d7gW0WPsOA2lw8ezmJqRHDLWYO/0FXPQrepWhUnvTMtz7MU4QmgH?= =?us-ascii?Q?SqRoMRR38D9r+ijt52gYQ4f86WnPxXuGNNuaWCTq0gZ+Kb3bvdtVxdH94bja?= =?us-ascii?Q?z9K+5EKnE5fFEZZ11XbXW1NgztCM6iZmOd7s8fqvHLMT8jzhFO4vYDF8X6Gz?= =?us-ascii?Q?P9DzTrcfZNlX4t0a/hZcqFzHZ94PYpbp3Ckdhu6+PBQOMF1yHID1T8sg2SXj?= =?us-ascii?Q?CNkCsHKuxWyInKFSrY+YLiC+f2AcAyyB2nVeyFFA7TOonbGV5sTY70qnidrW?= =?us-ascii?Q?qBOqmSQZa8xgJdavXc9KRez4f5Trpfig3Hj4J34gxhXJrf9pBDIRvReQI6wD?= =?us-ascii?Q?byKXbPpk0tA9xAnIUAsg1lhB8e+F/4l6U1xZKti70ez7klT1bFrGbGw8u8R4?= =?us-ascii?Q?rFS311juTBIq9k1qDHr937rsMks0SRYyVWX64QrV+LCwFqpiIEVu6g1cErUg?= =?us-ascii?Q?NbJZnNfZJJU182xFv397Ef9gne8oZJ9LQN+I1deHi7vN4eA+XIjEqk/6UIXg?= =?us-ascii?Q?OJ8vyn0+Pu/ZPFwYcU/W9GfWJD9ppmwTK9v3mI1vrK1Ct173PHdPXNGWnLqc?= =?us-ascii?Q?x87kep+3MnMK0BRutzaDrLRvq/tIHyyUAgQkXaoVWWYG7GKBWgTVl4xA2so3?= =?us-ascii?Q?wPwjDWbgZ2YCzdw4+gjhdWixTATP5yk3YW0Epht7CzMrWC01hMGATje5KBxK?= =?us-ascii?Q?qvKY1i1OyfpVC70sLr0cV72HQNKBOIIiUzv2D10oBl0fPHceeZwdIlDf5zeX?= =?us-ascii?Q?0EnWJcKg3Wk2OY5F+LMzzia20IijKDUSKXF9gVJhDdp8MI++w6lJ0WfTI51Y?= =?us-ascii?Q?waiqk+k2mHs6irTjyp1M8fhz9jJIouU4nc/wTfa7ZW58a76f1ToQ1z/vxDDS?= =?us-ascii?Q?UQQH54x9XmtsMbQgEHRYSyLDq0+13GhI8Eej07jdrSqJZ2xgSKR3aq5pEQWb?= =?us-ascii?Q?zQjxN3pqGikI+JvVKV8bR9uA1hCOmtEaMFbYeBhuci2G5qsOqD0l3SCOYAxH?= =?us-ascii?Q?nF1nHKb3+Ld/HDEKTul+MGh/wW2WLggq/tmkvHxuvnR+JWY5LjTxeSQQkOC7?= =?us-ascii?B?Zz09?= X-Microsoft-Antispam-Message-Info: rk04NGGbtQqPFblr1HSLwPqDglGr0VErbs+v5b0niK3SOz0BTBDgbAlM3K+ThOwyiT0xgpnVg5ctygIR01I2i2Ely19ZpYPBH7mhpWyd/RCvE89+H1oHptI5mP+rC0lLeijFG0n6OOwS6/vY3zD+hTTWqwjLN2ktUTHQ6fGI4vQx2g2OmSlmhL+qwFCKHBztbGhon+Yz+QFV51hM5vo80Xd6j89HEcm/5ZU8fSn2w09GsYjwcLAT0OEeODb8WHTExRncJtWscON8qFyDwXr5PamMDtq3fLwhDjA6NYDKSYaLGMfFoUS8WQSNtWbr38VPW5xxyBZiByJSxhvPkxZ49sHU2ZXPkBCMH/cNR9UiB6g= X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 6:NbCUeSlirIXsdMln1GDHs16UzzJv9N06rWmCuT55ZVSUxlBvY/Fb1y6V3oO7s0Js4bXIblPXXDPbgNU44hRq7Lv00kyQj/JW9cTqP/DpFgexdvQoH9JU84pwsgYV5kLmhPBdiyKpw1WsmThIrSv2EJHDFXPeQ3VqlpkfqS0uJ+yhmQAVXxckd6q4lake2yl+TpM4fBrZJmqd7vJAeeIheiInfnIsvw/kxJnWVR+f56RC9sgOR8XkeVCKsHbj5f7bd+uwU6cQBgvXIwqbzSNTfRz6UB2Vgy1tLOovkpEKPJHolKHWCkW1V327FNbRwW2/sc/o3u8NPHIBYsMGiZ5+KJ6s0NAg1PkoVhHYynzXRmd9+JNDp8R82Y7JptZmuEPLdUOQLXRsU073prnP2wOUkogBGDXm5+mK2fR2BxTFQ2/gYfyvZgVHhjzEWGNZexh/BPBobxtW71+1fGXFfXuXzQ==; 5:hQ1rFXk1Uax/vpG1nI4t+zUU8972xJPZYt0gAUxD2ZKAPstv24DTWmzDlqTEtSUrY4wJTuLr9tLcHZvDZCI5ngxw5Q9ppuw04poia9zW+E+PBwJQywNzRb55oTNktupYyM2vsAl6qFHPXDYK0q7cxtIbz9NkFntOgxabvMuqCrg=; 24:NZKJkn0Kh/HTrM2e4D3Q/jJ+SnTL38m0xn20oz5/yh6xEQvHPAvf0nFaFALrgTv70uHwvhNsarL4F02ZwSf5xWeAXM4GWpaka2HArqgAyHo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN6PR12MB2685; 7:fHwOdKqoi7+OjW9AJ+JWoB+IMQQ9lBa+gQZTe07QVQECJNROjUwVYaQSUhUVV1kdJa4aNYFpgzFsYTRDsOkpdxx1kQuZGHlVbO7n+70VpKb1qZzNlOwF6VprMdChQLaWkETTb6H9+vCkmk14Iu0H78kxeeQ/wbvi7m8cxiqGvlguu743n+gcmfmePxylHcFeqYVB7RTzbo9dgE2S2plUGr1QJN3NWeXhRmttauG3FN/oqYSVK9pj/NA5MlZanlvU; 20:B/lGc29PV0UCz0K35diCX2qpsKMsT++RGAn7wStTE3wDeDrvoLfUJy8deDjM6Dbgvdm4qt9c3Y28uMqUsPLEiHvGB42kIfMg3ypFHpH7c91raWtoQf0raGSuuizeNc2iAxW3NMA3lXZVunPCt0bdIvz6IsJKcRVCUuPjfaN1wqz+1AXRsIdX9285KOunDCd+ogOcb4iUdXBMqPXhlR3tEdTC2m9ImbsMAd2bqpd+pAdnVGQpFS9SOvyPgXVbrviH X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2018 19:12:37.6086 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cf20d36f-429d-4046-b96c-08d5e2ab45ee X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2685 Subject: [edk2] [PATCH v3 3/3] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Restore C-bit when SEV is active X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lendacky Thomas , Brijesh Singh , Justen Jordan L , Anthony Perard , 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" AmdSevDxe maps the flash memory range with C=3D0, but SetMemorySpaceAttributes() unconditionally resets the C-bit to '1'. Lets restore the mapping back to C=3D0. Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Cc: Justen Jordan L Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Brijesh Singh --- .../FvbServicesRuntimeDxe.inf | 1 + .../QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c | 17 +++++++++++++= ++++ 2 files changed, 18 insertions(+) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.i= nf b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf index d7b4ec06c4e6..6bb5c2093790 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf @@ -54,6 +54,7 @@ [LibraryClasses] DevicePathLib DxeServicesTableLib MemoryAllocationLib + MemEncryptSevLib PcdLib UefiBootServicesTableLib UefiDriverEntryPoint diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/O= vmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c index 646427bf4e2c..3add4bbad74c 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c @@ -24,6 +24,7 @@ #include #include #include +#include =20 #include "FwBlockService.h" #include "QemuFlash.h" @@ -204,5 +205,21 @@ MarkIoMemoryRangeForRuntimeAccess ( ); ASSERT_EFI_ERROR (Status); =20 + // + // When SEV is active, AmdSevDxe should have mapped the BaseAddress with + // C=3D0 but SetMemorySpaceAttribute() remap the range with C=3D1. Lets = restore + // the mapping so that both guest and hyervisor can access the flash + // memory range. + // + if (MemEncryptSevIsEnabled()) { + Status =3D MemEncryptSevClearPageEncMask ( + 0, + BaseAddress, + EFI_SIZE_TO_PAGES (Length), + FALSE + ); + ASSERT_EFI_ERROR (Status); + } + return Status; } --=20 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel