From nobody Wed May 8 00:01:33 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 1530889259537810.4964366570096; Fri, 6 Jul 2018 08:00:59 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B533D203B99A3; Fri, 6 Jul 2018 08:00:58 -0700 (PDT) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0048.outbound.protection.outlook.com [104.47.32.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CD23E211F888D for ; Fri, 6 Jul 2018 08:00:56 -0700 (PDT) Received: from sbrijesh-desktop.amd.com (165.204.77.1) by BN7PR12MB2675.namprd12.prod.outlook.com (2603:10b6:408:29::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 15:00:52 +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.32.48; helo=nam01-sn1-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=2purUg/awxSrQME8PERSaYUaDhefqq01YOaLDZLeo00=; b=w3M2+1UAah0p0EtbrkhbcX/ug6Y32ENwdvEhByLHF177tgFccNJlFp+9Qaxc2STtM4AxqwKqkG12ZmxR+i0tWOlUA9WHSBxVI4OSW7SoNYrllb8INwZSW7ng5xqYu5ntE3R+SuA6WUci/6Zqj1k8yjIEIJPJNtCJfYweNOJL6ZI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: edk2-devel@lists.01.org Date: Fri, 6 Jul 2018 10:00:40 -0500 Message-Id: <1530889242-21667-2-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530889242-21667-1-git-send-email-brijesh.singh@amd.com> References: <1530889242-21667-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0201CA0017.namprd02.prod.outlook.com (2603:10b6:803:2b::27) To BN7PR12MB2675.namprd12.prod.outlook.com (2603:10b6:408:29::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 00a71eab-96ed-4024-40a4-08d5e3514516 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:BN7PR12MB2675; X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 3:oGKjJWxC7JTiB7rQQe+Vpy5Iv/Kjs/+U8dch7mekuhZN/LNnIW3Ignss3lzs8JhmzIDn/0sa8d02B+ZVWToGETwogzc9n9lhBYvtybS3+jHXI86dqsPLRvpitISad5cQbejNyzaPCpOhXlS/MhIeqT9M0nYe2sOpNhxcqp640zCpxguLDg3zpoPOPaaTOr7zfN3huuJDrMONVGGvokSkaIoJNacyjdvnoRn29MXDtUaNYJI2+n2DU6laUVN/5JL5; 25:52U0tS6l8xLGKBTZuJuBjlFudkB2jfLbZsE2IF0opsFVZ/X6M2ZNgSkuhQHDjyTu5ANI7LnY29DUxR4RRfebbugE26vLNhVAEri2PelaFyGGevP7GCdsg1+wUq6C5pg9lQHyLaQtdeIMJT8h8TQmBAMi6Q77SHqq/1G3+80HVJx4ZfahK8aNHIddlj2dKF+LHgSGj4uQfRBXz1X/UQpKNeC0voIuvRACZP/FKiXe3xzZMG/SJtvAnALzFnmoak0zUNOF8isYaSQ+8JncPQ/ngHfQXmkTFaZ93+KoGmRSn5NQ7v4j6UMsU77o8Of8rHSm2B/7suG/zRG98AKXq7VGeA==; 31:3Kz4Dm0vugYzsfAUROUN9XeohtsiYibk93z2teF1U6DwbLfT5mgRbRNmjz4KkM8JGi4k1x+neYAfopuWyITaQXf6k5OhF2h8Ww7jn98ZlJKA34+/1ublfun3DJjao4vBUWok8XglyF0Gmh6O/K0Wa2ykrWLDwo1rij2DbRpBf3le6HQwU3uBQUdWhjP6Mtiv66et+SyMCavZluZHJ/JFyxIM0tx8RF+cuj2Vwo0Rd+Y= X-MS-TrafficTypeDiagnostic: BN7PR12MB2675: X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 20:3wLMwocxXz9SYTdEi9VGCCrKYzFM/ozUXnBWncWuNDigrozeG95uHtp5g1cMAIWn+n4HUq3Ih0x6It+IXfhDmvn/ejzRDjdp2sbPRNquDrSgpDraW6i//y8URdWxES0uYvJWYeh9FbUA7XhjyjSVZ7yRvEBduIamllYjxTx4FcyovYzfG0any2KC60nz3Quh/h6W4lcI+NDaPg3k91urs7nMhn0pgqmetAmqYRxf2aIL6z6I3UgJLUAyMTv9AxL4UuIcaUrCi5Xnnlbb0gLytFE2RtDGYwg/sDikh0BhsPC+w3bzwKZObOjYZqtBoxfMwh6WOxh26pGld6nXKbfJO32qNHVWQccXZJF9TUH+rYmlDRjwzjjjiGNJ79YOcQJqeparbB6YgjASBRVfrEFJMRipTenQQR/OueJaBshxXC/D23skAv3CkL9C5SQbGfWE4U7sG2z8/LV2flLofmhTPWrS3Dzti6upTwqKTFnO8QMYaYlU+YALfwJhAu3BHzhc; 4:d+UExrm6GWg8xIzOxxNRSMjurGxFqEyUxSGOTIv0Zl2AUdoTumh1TC6R30bAU9ghm/TcRMSX1MQj/jAHmURe1YZB2ONoQas4fqWgjtL0Gk6zDfdOKkjWjYgtW7Uzqt4YgZl4gaXN1IEAZdwA6Oc90dBoRWmpiSKmIql5DYoL2CWKyrPEHWEr6p2ukCtpeBOLTX4Yw/Ck+J1TTGUHCqrjq/VTH0TcFnJjxcsKe8PqHnfcmnttvxZRnNL8F8mFRYdqXRPYLe8qGJK5DzaeBq4dA+t9KhuA+NR7ZRgVNPC3UgsXoER7dN/3cpCWBmIGTCVdHOVkxvroGn8txJoLT9mnFn2hJStJ63uMUFuZqYaTSqT5qzTJ9655btpIDLJeriJX 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)(8121501046)(5005006)(10201501046)(3231254)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN7PR12MB2675; BCL:0; PCL:0; RULEID:; SRVR:BN7PR12MB2675; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(136003)(366004)(39860400002)(199004)(189003)(478600001)(52116002)(2351001)(25786009)(2906002)(6916009)(3846002)(305945005)(51416003)(50226002)(68736007)(7696005)(54906003)(81166006)(8676002)(6486002)(7736002)(6666003)(6116002)(81156014)(50466002)(48376002)(26005)(86362001)(8936002)(53936002)(5660300001)(386003)(47776003)(16526019)(76176011)(16586007)(316002)(4326008)(36756003)(105586002)(44832011)(97736004)(486006)(53416004)(956004)(186003)(66066001)(2361001)(106356001)(476003)(11346002)(2616005)(446003)(213903007); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR12MB2675; H:sbrijesh-desktop.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN7PR12MB2675; 23:6jeCIVeTLwfaVJgtT091Ctv3efuTyXkKA8yPNjfD8?= =?us-ascii?Q?m+P5hghpv2WV0NSlL61pYzHJoGb3FO1gYqrLJhilrwujIvAkKft8BEk9FklA?= =?us-ascii?Q?PxpfaeNk0C2kxCdUrKDJo+sZKq/TIZTsrXgSHD3j7HTXo9Qx5LS/TS3dGMWB?= =?us-ascii?Q?zTE/Kw+MasXEL4BWHnPZ8Y28+lzI/eQfAf9mKndZdA7nqdblefFQipa0JGdn?= =?us-ascii?Q?oNP3UXObLhU4on0MMHmR3u1n5BJB19+Y9JWLHlJvYOhez51uEt7Y9blF/lYo?= =?us-ascii?Q?UR32ToPTbQDB/PxHzXBw7bmx37lUe7u7Qm+Mxc5ni5F4fXQO2e/SNbxJtp19?= =?us-ascii?Q?8MSRpuLex79dntk8hnfb8Jv9MmAEUXrca9asZmkSpaf9dkdT4HKWCL37mGhH?= =?us-ascii?Q?QiX1YPysszs9R1wEnzbG4qh8t3uma03vxGi3UB+Hi4Y7CMfnCEyfJ9ui+0xO?= =?us-ascii?Q?NvHaIgRF85Gbbv8JHZyQtd6iJ2637VpvwarngFshm8CNO5uGJ8bwDIGqpHTz?= =?us-ascii?Q?cA7AfViMnsePJHrC7VZEk5Gcs/b/JSVv0MzQjaUqxX4VBD+ACIVpul8hDtQ5?= =?us-ascii?Q?7BhBuMll/YMIDoNA3MY54xutx/sRFbC62PnGC0Lifn1kn3ePclJYKCTk5Zb3?= =?us-ascii?Q?7bANX1shJBo579hagqIvJ/g/hnrNWWdQ+y0pj68zXpmOfJ3rqyyA/bz5VI27?= =?us-ascii?Q?eVJfrhdrRYeeUD/cIAxPinVLmmgL4dQZwPmHs/d6UunfFfDa3faeN9sLihh6?= =?us-ascii?Q?MTERGBJH6GiDaXt+S1fE93kMAyEWlEXzcFyhAv6G96haCWi6YawXlJstgNkN?= =?us-ascii?Q?metTao5SCL9SiSegXKowCBlkLyJyFOaKTsYw7qdzO5cWq+pZ4wXP4jf9lGtY?= =?us-ascii?Q?0it7moPKbNjHGqaeJlD6LZqed3zkQf1JtNaufy6YD5CLw6XuBi+1ZZJd4Wlx?= =?us-ascii?Q?Tnvg86qs3KrqH4Rejmf+aLHhX24D3uCmMISn7w4+0/wCtPYBPDh5AJp+YJu7?= =?us-ascii?Q?W1x43DOpIH+LYTGYR+1AcAcPDUJq282OQ6/4D3HF3bI96kdpur9iMhfKXqgS?= =?us-ascii?Q?6AfkF5G2stfx20f6Ed7kB7htg4+1bF4i7cG/ol2+hHbM/2l9HxzA9VtlgM5R?= =?us-ascii?Q?WlFQWVikhXx/avO1tKTwN6frAhFA8lLIktxLq2pYspvIDj5qS2JGRBPd7uMy?= =?us-ascii?Q?JaMBrYib1MbtNxt41l6yGVTY07B5vHwu4Q3Kv019aUUQq6YAuDxu+EJK8Erb?= =?us-ascii?Q?qaHEn3uB0o3R6l2Sa9IsfiVbyJyhIUznvHjYzZx?= X-Microsoft-Antispam-Message-Info: AxeJD8kAGS8Xx/AkxvzZ4RSoOHPFJT67gEKyZwem6J2DXO21o5iyJPT/NUVsMsQPNDH38XhO9ah7t/27q02DLtw0EdZig0hDbY4LCB1SskJY+fbLG/ODu8jSHr1xL1qyXni0wCukeM/GUrunGhCE7uljBWM6wU8pXaqCgZKNed2OXQZCStlSux8p7OlcsDCWfRI5LjGhdAqyNt5JZa7J28Xw+k4gkcZxVXMv+vilhZf1Oljktdz3fa7IJsv3bvSaC3qKFKmFD/3MTHmCL+eC0Vls7iByCxTYqo+ao6dWAM6/yDwlyulrDLWLDs8U6bWv+0AN4Iw5c2sfHnfy3LXklWRuyNO8veGOWjsvN9vvTUg= X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 6:Wl1f4ILJjmbjo38xeDQthekECC2m5/EI603rT27R+qPPkhp+rYV+Oo8bIWpzEBLJ9bsWXdCWBwWHp+Gdlt9WC/PSu2MkzUZtPyCd1YDUzN59+N9MeAD+jRSD7rx8OtnQHcwYHBj2FGy6ggSDD2GOtd4I5Okerb6OY+8ADhr5myi0VTCRM/mmnuvL/kI16Jw75M4O3htpcr2JCz1clAblZutcQfVqPunpZMXDBOD1pBh66zJ9Hmx5SCsNyVySvQNrNwPm/LCplLA/ciPbV8KaZnJ6cEUG2hxI6j9j99MmiZAp+X/EAA2DtXUQ+d0/JlLIeGigG0ULM5XhVpfMIarw/6CMe8ihhc14WX5DnHXgxym+/K3F6ZGHb0oBMOSyr6xq3SWlF6M8Gx0E0iWW9GXIIMxApiJ8AcrNH9qg0A/eyhk02L1hlARVpE4NtAMNsEzX6K0p/VXLT4aaz0XMA8HRpw==; 5:XiISVrcQsR8igWRpb44P/Juf6l2jWXySUl021dJfLLN+akEd2OpACVJjapPYTebDiMn7lmWWHUGqmR5aC0f2QvJmkL66aREAs7cVAASU/AFubP4kbRwXe/weO8HenQCrwZZNCHAnR78za1ToMnxqtiawcajnj4YyLpS8Hb6Jgew=; 24:PzqjBrLTWmWNzgoCS8zZ77LK9pGmG9VWbsUf+zvTm9XuUazuNw89ry9TLb0zjBXQdREj1uRQDmjYlPHhz595LI9Ru/h95e2DoPErsSgW/W8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 7:pE8RI7BdH0icIyRCHeV5s/imcFNJP7aZ470JyY7H/HIbtpLpBYUnVfeTygApF4+8FUtO4DCssPurdq25/U1+Cb78rzGgRTZxsWvLur82nvaVITexTQ0ClF3+GOb0XGn4g6HLsN8bnPReq7Y9O2Mi8XTVU/ed3zxjwK5NYhYdFAet4KS5RTLQdL2xtY7gclZgoO6OqkJkb/Tt1iIc3GINDmTLE7ILJHn+uf6js7U/WJtnyq3DzEZM1ZH7BwRB7LS3; 20:evb133GGYBcMJEao5/N4X4+mrak2z24co57Y4niZ/gB8WhgN1VRVyfF0e6JB2sS+AvKRRjLaE6aw2QkIxH2Vj6UNyAn+sktMnMy7f+/wf6HxY8E2YIIFSmY0MUmzBkl2kAxVaExKzbxE5ypUtl8IVyDHeLuy31op+L7c8NpyV13QTbaPb9nzjVRiynVG5RoqqgS6lAbHPdP9YWDGBpYSF/JHIcQDZNpqFTJ5jJaMhR+m53vTdIu1X2clHLhYZEtQ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 15:00:52.8151 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00a71eab-96ed-4024-40a4-08d5e3514516 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2675 Subject: [edk2] [PATCH v4 1/3] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: mark Flash memory range as MMIO X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 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 Reviewed-by: Laszlo Ersek --- .../FwBlockService.c | 30 ++++++++++++++++--= ---- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/Ovmf= Pkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index 558b395dff4a..b3f428bb4284 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 ( - AllocateAddress, - EfiRuntimeServicesData, - EFI_SIZE_TO_PAGES (Length), - &BaseAddress + Status =3D gDS->AllocateMemorySpace ( + EfiGcdAllocateAddress, + EfiGcdMemoryTypeMemoryMappedIo, + 0, + Length, + &BaseAddress, + gImageHandle, + NULL + ); + ASSERT_EFI_ERROR (Status); + + Status =3D gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescriptor); + 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 Wed May 8 00:01:33 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 1530889261007464.36374646463355; Fri, 6 Jul 2018 08:01:01 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id E913C203B99AF; Fri, 6 Jul 2018 08:00:58 -0700 (PDT) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0048.outbound.protection.outlook.com [104.47.32.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3D60220336AA3 for ; Fri, 6 Jul 2018 08:00:57 -0700 (PDT) Received: from sbrijesh-desktop.amd.com (165.204.77.1) by BN7PR12MB2675.namprd12.prod.outlook.com (2603:10b6:408:29::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 15:00:53 +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.32.48; helo=nam01-sn1-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=FaaHDuaO4ki0IQjC835q6D+HGw8UFh2lznRCVGq1R4U=; b=4WAD1z/86jEj3hHp/1NEn91OzzoUI+5GRHz+C0TibtjFBau9uuEEqlF+6GSj1UrQGJBMCl+kbmBtQ94ph0P062HgHF8e+uL/ztjSd4bf1JUg7odg0VZr1clWnHpwfxFXui4i1zTvF3YsPrrDPdOMLyDkpVz99P0FUJSBwplqOao= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: edk2-devel@lists.01.org Date: Fri, 6 Jul 2018 10:00:41 -0500 Message-Id: <1530889242-21667-3-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530889242-21667-1-git-send-email-brijesh.singh@amd.com> References: <1530889242-21667-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0201CA0017.namprd02.prod.outlook.com (2603:10b6:803:2b::27) To BN7PR12MB2675.namprd12.prod.outlook.com (2603:10b6:408:29::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a91856d-b6e5-4133-9766-08d5e35145ab 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:BN7PR12MB2675; X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 3:HCNHaOOjaPuR6JWDgMLR3VRwUgLuUGQoYPmV1pdH6eEudi7ScFp+EKacytUBWlRpurDtgO4RmjfZIVjKfPKzt3tiywyh6FRKuZDJjcW+LO5Xz4RV0UHuMhDU57Xps3RukMwyR9Q5o73D8u17A0ZcCRA44WhO3ZsGC8RuaupWjffooEh3t8G1guSNE25jSf7pq9B/m/nZsduJDfleq+bVh8tW6OocXX7ELG6vO45WS+hsPYzOLiaXhN+HbYl8SYdF; 25:UJQPeB4yHI6CwWS9g1PSw9hBFi5IKUj1JDPX2pUIBQAKFM6JFBD4UjpgENMsJDOgk+mkGgNQXUGk0x4qL50t4TAYWlxuKSOEn+0xNKUOqinHxxXzrnrlwbF8/3nfDWh0AXdb/p/zI3d1HcfoXT8cU4AYx7zPeJJYcPkdc5RyqdfrpbiPN9xffzWt1jjhLHEMacZ+J4xSQIEvLPtJg/NQfh6TEKNB38rWLjLXp//eg3fgu0lytz3aEbhJmgTByR2vfMg9Q45Tg9KpEYUqVew/klKNFdY2TyVJtGwonEQXJOqGfZxx4d1XstyrGkg9Cz3l9Wnegh78p9ASHm8HOFTbJg==; 31:TnuJaX1+GOfU5XyFllV2ZWCTSWF+n7tyM6Ljr0eS4w8FaAwKFBDwCCq7Qd50jxclx09m8fC6Y45A4ynDE5exBmWIhi407Za755101aH1yAiUgLm7f463mv/r6FbtXGI+4fmVueJn7Z6jOtp966toIDJCTNH3w1EsXAqUnRu1UPQ89cJDnbiBSD59a/T/7aesr7+OiFvxIi1uJ/6KZEVcFv/eKZIOVaX0L+AE/WxS8l0= X-MS-TrafficTypeDiagnostic: BN7PR12MB2675: X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 20:erL6ukKaTmSLan40l8n1GCpNyWmZu3YVp6rfd/htdWJ0KbLaVaBbkUC1mxQLXwZM+XEiV8ixtQIi7qpsoONDzby7bSfwi9G0UEHoEmmMoBKKYIDLVyCi38JvGrxdnyGnC3xh4jbdYOckcpS4XR2N7HIB8Wyv6OjWfDg+0kQBeKBQZNlYXIdKpv3qfx0QgOFr9Xq6uWY6fjW7PY+74KdwrGR8rycCxjehKY2r1uBtAKQprKjNBtEsz3GqX3BjDHqllyfNqh8+QA+cd/iCZtlfSqCPLHFaxFN6ZozklUEJS5juSS5ulq2lNlF5fH6TRrhsTKx1smwYXrAMfwHfb1lEI8M6J7lbQVRWhObG74k8xaNu0OhAzFU5Y/OpaRBbW7iotKplT1G5jnVFHncfA5MudX0jfrG0jS//kILF4Q16iMXRHcxRuDqo9May7kLUaDaRCdk+TCUmlat8JBJdHBm78VVrNkxFcak3kbZUvsCA7KVW4kF10B8GvibHehmmYWTy; 4:33jyfcg0gZofiy42wNatna+rLQ4LXqNp37B8+Mo9K5LNfspDs1ulo8QMZMDLSj+0vu+6EWuCSOLh9X+HrFdaX1B5F4W6ouyvGtJwPYrUoIc7B92CbVg1R3suSv4XnP/THgBPCgQBNoC5f9PrKUvWuFTJ0ZGwXPbUDNGx927SE7CxpWiWLOrJngHF+vTCAp9CKW/XHlX7QwA6V6o9rq2sljNe0Oo/w4di2IaQ2jWOdc2/IbgCN2QlGELx6p3sCYS+KsISVlt7Az6KhiEu9atvYpZtnk8MfzhrEq+QT40JC9qnqGsP/Ro4xjrAeWP/Oq12Am+86n9uo70JVH+m8O/2c3VRMRF2i6AJsiuMwYAxl6nbPKt2BnzuqtwAS2aERC+o 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)(8121501046)(5005006)(10201501046)(3231254)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN7PR12MB2675; BCL:0; PCL:0; RULEID:; SRVR:BN7PR12MB2675; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(136003)(366004)(39860400002)(199004)(189003)(478600001)(52116002)(2351001)(25786009)(2906002)(6916009)(3846002)(305945005)(51416003)(50226002)(68736007)(7696005)(54906003)(81166006)(8676002)(6486002)(7736002)(6666003)(6116002)(81156014)(50466002)(48376002)(26005)(86362001)(8936002)(53936002)(5660300001)(386003)(47776003)(16526019)(76176011)(16586007)(316002)(4326008)(36756003)(105586002)(44832011)(97736004)(486006)(53416004)(956004)(186003)(66066001)(2361001)(106356001)(476003)(11346002)(2616005)(446003)(213903007); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR12MB2675; H:sbrijesh-desktop.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN7PR12MB2675; 23:VxB0lo8F52eUXtLrNKChZes6iXUOTkdeMqPLO7+PC?= =?us-ascii?Q?sOx7wwEg0VufwYdkUDMAfjalc5YhYT6yKWMUpV6GumN+NpSnHBog/HvW+04z?= =?us-ascii?Q?3JSo7DSCXHoFPmuZOmZrKCx15llh0CF6XTrQyhJAkj1XOMWENKZ+glzq3nKR?= =?us-ascii?Q?JhVUfopDJDG94sD5HJ+qJQMCOJfd4fEnSTHWWdh+YeNonn23bSNrKYjltp+Z?= =?us-ascii?Q?p5TmNvDKkEkp8w9lzp09xExKzz8yaCFFNhO/k1CGgDqqmiJag5AF5bCFMqQR?= =?us-ascii?Q?HsDTWEroPnabgUuse/Yc0Ik3CyNXlV9Q007MzzNJ7Z2pRzzHjNijmheqOyCT?= =?us-ascii?Q?7v3bL+mZrJGiFRIzg2nVSDtxvYvi97IhE4iZPAMsu/ZXniGcNezd3GEOvoLO?= =?us-ascii?Q?MwS7BbQhEeBczkK/bFvIAh4VpSi/BXEAmQFezzBpi2WUfkxKbs5kIBEts/Wf?= =?us-ascii?Q?9y+EpYmmcNGporbQ5H2HkaomkHyn2DC693E8fKtDw7KVSHy5N6XswvTzsZla?= =?us-ascii?Q?NAPG1FRylzdTCiMtcXZBQpw21mAAWblW1OtXwR7pF7f2gkcsfX+8Nm+qINzw?= =?us-ascii?Q?2jtlLInCWh6KdAKcpXzOCL7bE8TOc/cPRxa3+SqCtxMpdzdGQs96mm29I81P?= =?us-ascii?Q?6VxfHI2rfWQ0vDCr/E4fAm6OwrF4cooYqAcGNCG9VIdbAt7+YJ6bdux144YO?= =?us-ascii?Q?qV53zG8aX1MeMle5ATkJgpDuR2FJGszz69MmkbFPgGv9h2jm+bnxwV2kUI9m?= =?us-ascii?Q?Vbf5iGE0E2Cb1fLzhQPkmeDDDIlwamiq9n+HCJEPNjMZSVWFO8XBbIcMti9M?= =?us-ascii?Q?fySQE9+Zxe8peATEhHkSQnJOVX5pHCniNZog4JowrxN/CjYq8zd3hEsJs4yW?= =?us-ascii?Q?etERH6bUHKMi4gyiu30WH+V4FuL36czJWxiOI+fHnJzg1qhyhu1gQae/Ef++?= =?us-ascii?Q?x3965GB0kYbFBcqqY+anyEAadqaXfNL2KFKtVC9vZBRJ+J5mWbYyQ0+vnLT8?= =?us-ascii?Q?WEJLYtOP6aO13k1ux+opI2bL9F46554NG0lsskO/k4dV4P4Fcfi+IY45AM9d?= =?us-ascii?Q?+Ye4vmOh2HfWROHHt4ubOf4SUsC9VsrBohLY0nj1p78cjoyXDpKgHDkhXhWN?= =?us-ascii?Q?g1oTM3lL5r6cp06WKpfuUhOT5R9NAaMV5HTyPEocHGbvWodHpTVzK2dG6tLg?= =?us-ascii?Q?za3a7f2d9lgcPF3afcqNdDvzWM7a05PvsQm5TF8/+wJeLpbnt4P+BuEzBW9v?= =?us-ascii?Q?z4BxW76tRWx0zY/oYo+HwxtQIzP2ADOEmWT74aO?= X-Microsoft-Antispam-Message-Info: ehqcQguUz5+Wvw5Xh8VKyvZOq1NvCu59y1qPaQCJ/pAGCDvYFGn3eUTYDgDDizwP5YNCJU8rX1BiKnX5CwO+dm8ZjoVFJhCuaOptUeYVVrq4H2tgkevEOUlA7RvzPo6HWWbNJbprKwjD9IKDJufDKh5ydAuG2EFzpG7KWQHrX9aGQ7R8ZjSZ3tX4DDljD33mT8uSwXpJJERLGVFIOwJWtN2y1SWbKUb1JYZAW9aoXz+3B9/yVYg+V79Seu5lO12DBvp+C+SK1ZcXyqC6CEwJ33IMnmZxHkm/OWSifLRiDe7zyGnxprxcLiBpO4xKkThlzL/5p28uUK6tAn+cYNaCn2HSjpAYKwlC8oXQfwSN2eo= X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 6:U0N2WWhAiw3+bRyXmjANO+Z81xOnfXjHjq2J6lvIavKkV6R4tJgchRMy/D0wFNVdbvw8mpBoeIW5aF94KbY6rnrjKU2Tbyt0Y/U8WfuWoIUkmKa4/TS4pj1e2HS/4H/6YTmNm8Dp1MCQCdCo7eFTGZYA6n93MlWxVPeux7BRDCMu30eup3E9xW5dgQ14mkkIvhrybOMupMQ8J8RVl87J6ZeZ4v6eI2jorQs5f5c8aY9WDxEr3cV/mfDVCipe4n3xteGglyz1TJlgb3k3qyUtsDMXhmSb9WlMF3s99DWeJw+mgzjE84WjEPd1a1KZZrVyiMoYA0mnYugJKjRZIacVVIKaIh2VVpN3WvNEwm5ZMPXg+Vap2cHHMZQS7t2urcG+kV8xvNEH29dgPXW8OKqs0lcGlnPnK4tUJgNFOdMiWZ8BPFQLNBCECzBYmOnkNiHS4SDpcWCcStKcv1rtL83z8Q==; 5:Y/b67FdJSBYCWgycV2Kvy7PD2xROtRX8R31djb7qIZamYQHv8ptZzwRRxJNf+DWiw3h6bUhUKj5ibw9sXoJX4ZXdXC6Qcvizec2AQ7C76++HUR+73xWgQiR6yBwqr3NCz1rYGdDYGqvWuGh9RkmY5B4/XQ+Mbsh9X0nano9gSp4=; 24:fDzVlyCDwHbd0RsKtOI28v5xp4f72bjERZyuZ7peKNchGS+/5EsYco9kWy/8dnTj2LTv13HXDkweTaM6It25LwXwJ0uzUqaoP8XoE/y4Vx4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 7:YdRsaYuw1ZzqnxiHZY+iL4oiM2EZwVPUA9nKiGCoNrNjQ99Vfituq0LeZHhr2xAnvX6ihuf+R/+dsDNL81PKGrmsy+PBvBPO87YxKOwDqKD389aVRU//aubhwoUjCDPBV9RIs+hx+h35hctlAbtJbJLEbH+9n7HT66eTiBEKdaJRr9WXbI7CrMl2AuYJm6dBg4PkcR7Q6g77L1P2VoOaGsmEqTQbLRrOhyAEMkzikvN4O6Op3VlF4FEAkyHoi7c4; 20:c4oynx63saQfZWmtnK4FEdPX5oRF0jUo62s2fWJjlHSBAld2LlF/9msFpdRGChmhHXiq1NehekAuufkSEg31DGZ2Iw+g1DOXtsscpo/h9wrqoC67izNiBPkHZ4D70u4/3DG4rAKSe2R2T7JztVRiyB4cg4bHqK9yjQFNeoodBMGHoRQjslc00CeKc9B9zqeH8dI5u5CRwUvunSAVDekXFLeDR+OlwmNT66Nm2aMkigHcyKkWVPHHGhiax40HSiC5 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 15:00:53.7928 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a91856d-b6e5-4133-9766-08d5e35145ab X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2675 Subject: [edk2] [PATCH v4 2/3] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Do not expose MMIO in SMM build X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 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 Reviewed-by: Laszlo Ersek --- .../FwBlockService.c | 50 ------------------= ---- .../FwBlockService.h | 7 +++ .../FwBlockServiceDxe.c | 50 ++++++++++++++++++= ++++ .../FwBlockServiceSmm.c | 13 ++++++ 4 files changed, 70 insertions(+), 50 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/Ovmf= Pkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index b3f428bb4284..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 ( - EfiGcdAllocateAddress, - EfiGcdMemoryTypeMemoryMappedIo, - 0, - Length, - &BaseAddress, - gImageHandle, - NULL - ); - ASSERT_EFI_ERROR (Status); - - Status =3D gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescriptor); - 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..37deece363e6 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -155,3 +156,52 @@ InstallVirtualAddressChangeHandler ( ); ASSERT_EFI_ERROR (Status); } + +EFI_STATUS +MarkIoMemoryRangeForRuntimeAccess ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN 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 ( + EfiGcdAllocateAddress, + EfiGcdMemoryTypeMemoryMappedIo, + 0, + Length, + &BaseAddress, + gImageHandle, + NULL + ); + ASSERT_EFI_ERROR (Status); + + Status =3D gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescriptor); + 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..af08fa69d489 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c @@ -67,3 +67,16 @@ InstallVirtualAddressChangeHandler ( // Nothing. // } + +EFI_STATUS +MarkIoMemoryRangeForRuntimeAccess ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN 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 Wed May 8 00:01:33 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 153088926730990.35484558006715; Fri, 6 Jul 2018 08:01:07 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 581AE21BADAB9; Fri, 6 Jul 2018 08:00:59 -0700 (PDT) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0048.outbound.protection.outlook.com [104.47.32.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id C073F21B02845 for ; Fri, 6 Jul 2018 08:00:57 -0700 (PDT) Received: from sbrijesh-desktop.amd.com (165.204.77.1) by BN7PR12MB2675.namprd12.prod.outlook.com (2603:10b6:408:29::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.930.19; Fri, 6 Jul 2018 15:00:54 +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.32.48; helo=nam01-sn1-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=Ze7CGTHFCwv28AjQ3/xjsfCLr3nESk2q9l9KIo+Kqps=; b=uaPjNqIBLmq1KDtKt9s2TdUqZqW9fyj/ojH64v+knO/CHUjrZI8E9hUIxdM+yZQ2IhQU8BHvyMjIEOTxIxe8jx0GNxftrgEejD/M2AL5rRu1J2ODKbMqNtxlbzNIwgsc3ON8/0GeiBh2UmkuZLxw80TVsASUgcNn2Pax2OToufQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: edk2-devel@lists.01.org Date: Fri, 6 Jul 2018 10:00:42 -0500 Message-Id: <1530889242-21667-4-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530889242-21667-1-git-send-email-brijesh.singh@amd.com> References: <1530889242-21667-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0201CA0017.namprd02.prod.outlook.com (2603:10b6:803:2b::27) To BN7PR12MB2675.namprd12.prod.outlook.com (2603:10b6:408:29::29) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b57161aa-ac9e-4d55-5b37-08d5e3514664 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:BN7PR12MB2675; X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 3:aHpTpQDCn7ue+qv2ic+xrNaQNeyg4Uo7A2WChaG1zUuMs3EaD9AYKhMAnfvImAOHT+awVDxp10XzAzTyc5SR/3E4i/I9DgzgR5XF/lhjZWf+amHkY0nbtLUnHufjiSPBJM4kxqRT0hv1Y0qBzsgDsjwr7OpW91xDPJmMlx/+PrfCspJOdmTyFZ+M2hdG5Zt+nM/TWGl5LI0KmYUhcmlRGjma2nySbfCLhRoC6S05UcO8NxiKgvdeGhfpOrklldAD; 25:GC562DsLErUHc5NngNhG5w1Htb+LEe4E6Xyy54VVJc5/PwsY4VLpqqlimnnrlssqRUVOZzRLZz77+5wI+A58KSDJ+1suOrXqYKFEHhMTH3xAj3Jc+pbMSvcUtxrX7iBsNneQz+Eymh1fQaF8LmmZdraMZe1TqXFQPdaE8p72ze3lZ0w/WSp3IO8GMqQrpa/tt1CTmy+JjwNE0CdyFhfMgL/3PfL7sjQZZQgluSfSJe1P6gsmmvMVRN+Ou3sScR7FtjVtl0cpjY0DfS+aZo8iO5x5D/qWjzZ20HAVCuXwGDnee43xFJ1+gqfIgVi205VYmRSPMBuTDiW/iH/G3IBazg==; 31:SxUp0HwwFuaC1wI4QikggS0lEIyGyPpR4GNz649zhOO4PTXApmaqZvzNbvmJW6IdAOJIYZvVpWR+fkyG5bIDhgsxRx4taKga1uvWf/6ShFEkw3B7ezuNbv2+FWEBCwX/zda834Oe2rxXDqHKzmwvn986r88y2MnJezxAWBy068eVqhYUWRP64gNYsd3UAPQv1ACDylfHAozeJO38URe6eAhve6Q+wwbTWUQCEKL7LGU= X-MS-TrafficTypeDiagnostic: BN7PR12MB2675: X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 20:OwDX2BsHU3CIbNsSOIqPXN644tsmlXgRNx1evOL9V4APt4xw9haO8Bcd/bA96kE/Z8so9wt8t9XbGFT2lggx7T5b63CQtIv+9y9rwOwG+B0bMguI/eDAOoDK6At7972cAv4GpNMDpqC4EmvWQzomhw6jyICvr2yVK6p46Y7hnHYQF3IoD4ZrdqFW1miLy71ozAKmu3jlGmqtqfcDaowvDNOhV3ffg4yOp7rdds2wNe2RGJaMTE8EsKsLwBgQ2g5yjNJ970Cgd1OdKAPvb1ti4Vxaiw2kjStjyG/n2EW72sCe5YRsNs81OVGWbH1aTkwTuOYUQG8HOKCn0THzQf8CfElgNAwIluM7J4/M1MKeCntsqAEsl/39HxwELJTGakDVTII0vMgd9fUCnuvzBalIjzDrau2WKPx5EAm4czZMW3dWperSPUCUqOLKvTM8VDyPL7DAxwYw5EuWTxpv/TlZhBCSNZofbumzpghnPEt9KBvzm8dLuk6iwyuOEWOYYEYp; 4:tVWADVdGvqSKYAgBq9lQXLlqP7r81YxuY89ljKh486dTjE2sXuVmuTMHnkRapt0iecwWXCpvkYxJKMzoKK/gZpsQ/t1DVcj+8cKHaKN2vxirAmRK8qvRj5MwTZCSMiwzNkxB/tEz47AoB2c7+5R/UfLrQPylP1u2PxKfv1j9BPAySR/dOwmR0CB9uAwMMRU8wqsN89Bw/RUbJygHEMX97OeAVddcBYu9RO+owPD9IFWOsrRAqgROpkz0/RcX80bUQj6ZpKJDKbGqI15tBQTePhLPzAj+a+YG23AxPP4NvPkba5Oza6KRBYR9oxWa8zy4Va97eBDaKZLJN6TA3TJgNFzACcygM7bpbQsE/JOL5bxebDvRtARSorkSUdiR3hmi 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)(8121501046)(5005006)(10201501046)(3231254)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN7PR12MB2675; BCL:0; PCL:0; RULEID:; SRVR:BN7PR12MB2675; X-Forefront-PRVS: 0725D9E8D0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(136003)(366004)(39860400002)(199004)(189003)(478600001)(52116002)(2351001)(25786009)(2906002)(6916009)(3846002)(305945005)(51416003)(50226002)(68736007)(7696005)(54906003)(81166006)(8676002)(6486002)(7736002)(6666003)(6116002)(81156014)(50466002)(48376002)(26005)(86362001)(8936002)(53936002)(5660300001)(386003)(47776003)(16526019)(76176011)(16586007)(316002)(4326008)(36756003)(105586002)(44832011)(97736004)(14444005)(486006)(53416004)(956004)(186003)(66066001)(2361001)(106356001)(476003)(11346002)(2616005)(446003)(213903007); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR12MB2675; H:sbrijesh-desktop.amd.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN7PR12MB2675; 23:fQtTCqtBY3mOwUVrYvYD9Qb9kChqAXDySQLTwh+gU?= =?us-ascii?Q?tc3KiElk9gvZvzTUm++HstDnDK6ugiQ6PlMgvB4oBZO6JWwGkHfp+aGqn10t?= =?us-ascii?Q?38NaKmHrm1VC8e/3t2/mV08r4sQ4v2ng45ZrdCbRYa8BkqAUK6vAErQNHm5w?= =?us-ascii?Q?MC861dYZa7R6yWkYnviuAvxoyNv4imiUtX7M2/1AiyhkxDsYV7Huv3xbVgEe?= =?us-ascii?Q?eplmGnltt8RdxieNOh2xzxnxnk2kJbnshUtTWU30Uar1dghdRy2yDwi6wVIc?= =?us-ascii?Q?MJMSkGalS4/SjQ5z/eU95Tau9/w39w0RgLN1xtUpOWrBlYYelrOLmwYCk9gV?= =?us-ascii?Q?3Y6vfTjJBqOFLn81fLS83pMiGduGrvCxNPZsyHZS+qxVwHyBvkRRoPi51ZXU?= =?us-ascii?Q?i4oxNThf93SN7PoQevnQKPODoFMhoZp3BklZbe9D7keAaSXITqSkznfIwTva?= =?us-ascii?Q?Gd8bkmTDnu/GrTZTIe0uW9ume0WEnZscITZkHoFA5DcgeKmZfc8QPRKfBR1m?= =?us-ascii?Q?PDPYirzgvlC63A/rGRvcsyw6o9wRyvjr3rWnW0d7U7sX12bQd7KhBrpMYV7e?= =?us-ascii?Q?VEQyVpqU/Z0j1XspnaNr5AEULob1Wp93ikPLfuMugtmva8epGg+R+l5+r3Z/?= =?us-ascii?Q?gi8V+n0KRoijKajqbakNiVh2xwzxrl91TyObWlW70g6kwt6hF9DCCfK0SK7O?= =?us-ascii?Q?If7NowgeYVcQCZXFKSNcV1l1jAlJMRNNVmisV7/xbBy/23VOqUvN61UXB2rR?= =?us-ascii?Q?wauBllqrRBudyqZ3ETcJqIFh7HwtFqMqdhG9rLL/Dz3CT/MmAoxJblh+vfTx?= =?us-ascii?Q?ky8/1c1fjKdJm3rRTMd0C3zphvtC2b0iUzkS4tYdrOT++VTSoiEp3Sss3Lxc?= =?us-ascii?Q?g2DZafLntgYLr+HoqpvYjtuc/VlMGek+DFoSvropyhDhfV4BzUNaqODFjRJY?= =?us-ascii?Q?MTKpHhcPMlyNvZkYdOBm4vmUprJ2SqabBblFyYvyDDrHtLfKR4z2lMUHi4FG?= =?us-ascii?Q?HdsbhoudngF9R4XfBQrlbY6Kr0hlZ5D76vq4uYqb9eYtbefDf75PYcpajVIp?= =?us-ascii?Q?AQSkS6DSxpna/LCB9KZ5EdaQYzED8J6RwJoYT3HDc1DYFCArR507Y3K0Ot0D?= =?us-ascii?Q?YVtpoye5yftamDiLIBnkh2r5/QDH2CI1CyN0papoGb/ViXkHbv3imFUDJ4ca?= =?us-ascii?Q?nsfyi1vwu2jnjRb5+9h7hy5QJ8rT1HpZt9Gu+MjZXT7hWb8oCn57+rmiES93?= =?us-ascii?Q?ySjCm9sm5IZ3cOTr42nL1H65Y6RsxQNMTi+lz4bCfgqt2KiuOfWmz93T74uH?= =?us-ascii?B?dz09?= X-Microsoft-Antispam-Message-Info: JDXEuh7tnIKZV1Ih7bIxdlP1tZxGD58SuqPS3sFC8oSusy32kX4qhDNjGinrTOfJ2J2P96ORXR9suvFIpaWpfxsG6iS282pjMIikFd1IglbY654nKZiyRkxsKHtZWAOx/ujgiw9tyI3dsRlxGDj7gppcmb2qF2htADfaCN6MKnotcV0u3hsKLEjbmoqmovfEE/4Zw0UEVASjSmTkhLTw/0/31MMhwxXJ9ay1ZpRRnYtwUkSgPYzaKwpfxFKHrd1g+SQxX+97+zlt9Qr29uwjKG2nk2JKaDm3UhDv56AakWX2BIPu8zgVVVxKDMKI+ZAcECvVTSFHwQWnzbSuqbbuce40eTsy0OvT+Efdu/iNAF0= X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 6:GKm0NVk4zVOJ60ccEu6ugZWtAlqdTMP4ySJipcdKpY8aG2R7L421ieMeD5lVJ2xWkKMBSKkmwtN3JxtK4OXid0yeBWAHnO9PNyz1uky1JovoxERlSYywTZBctgvCjIcHLpLhsBqvsXBJCI8vrwxAJO/1kEX7kyFG9cCf5vZ6v9bOnChRkNPn6sF6aF9kXwwsBe9XZHXEWMXAliFA9qlYc0w9mU5OXN0o9/yAzvmoIDFPWlX5XfFIguWqqz/UcpersX+ErSGgsM6R+vTaMrlsx3neB0SMpkUaad8gM3T7qErQnJhidI/+1Tn+uxo+/RlcC/mp3EIZ2Jz7YmExgsRCEACTyIqK4gc1h3m0FX4yKD8ttCJmEKd+1RXznGcoDBlyOQ/ChGqeLtQIsEAxfGRuTWxo2UtTqC7u0M4gmmRWe5koHosAUph+bNaQRvULBKAYDtwUInWtmT3Q0LzkicKs/A==; 5:SMpQ0UQ3Vztni2qEnNCfQTHNGX+3XgkGiNWZfVExUsLlEigh9ez9WtLJ2+lKsw74cr1V6/QTJGknnM8ZDysy26zWp9hrM6GZ+iQQI/694i7wikqhXdQOsgyAQlxIcUSiyxyMZZpUVLITUm38OHgMth7nDcRnyV1RespXpCjg0gY=; 24:JPgoxhN1sKkxwqL/umX5tUNvE51Ned1UQxEMmlrWtbQ97wwnCWPeeJrKogX6fbN8/Q/+ZO6MpfIEKhlFyaxNwarqIuCvZi1aMJEgI/vn2zQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN7PR12MB2675; 7:qumAU7gp7NqX9TQ6yyt4+pDCq6B2SiDImUiilSIu0a0QY3DuVKJ4vcHvd/ItiBpN8jIapfYQgvAbZW8Li5NoA4QfVA1pXklABrVk5P11YKFV9Bm1keUqQpak8JAsYAdcSntfUICMlZWERzkcL6Sh+ihIt4/2/vJt7J8RtU8R0QU9BA3tdatNGLrvPVZGUsELT7ZLDCudUbAeKaWH8IjOU8dZ2EMvHX7o5AbHp1P4i8qOkDE8KM9gwIjgxIz/Uk/w; 20:Hb32e6ZLHT1qYr4WpeboAoPIJRNX2QwydkfD9//SBbE+BarfOr1Kf2Rnm3/M5fEuqCSMLHD+8xxqqwCB6D4BFQuInQVm3pITfV8X0BBQI5WH5lxyYbryjuO6D7HAAoPDaAv/cQZiIixKpjdB1crYiUwXrNuDDfHYJdGx9vQJE9LZTUNB9HLek9HMjalzce30XVjlMNeIX47ujSlHB9SFwTkMPCjaftR3FfbMrn0T8GvYgeiU4CH0pxlv4SpVwrge X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2018 15:00:54.7055 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b57161aa-ac9e-4d55-5b37-08d5e3514664 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2675 Subject: [edk2] [PATCH v4 3/3] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Restore C-bit when SEV is active X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 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 Reviewed-by: Laszlo Ersek --- .../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..86b244a0095b 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf @@ -53,6 +53,7 @@ [LibraryClasses] DebugLib DevicePathLib DxeServicesTableLib + MemEncryptSevLib MemoryAllocationLib PcdLib UefiBootServicesTableLib diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/O= vmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c index 37deece363e6..1fbe1342a57c 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -203,5 +204,21 @@ MarkIoMemoryRangeForRuntimeAccess ( ); ASSERT_EFI_ERROR (Status); =20 + // + // When SEV is active, AmdSevDxe mapped the BaseAddress with C=3D0 but + // SetMemorySpaceAttributes() remaps the range with C=3D1. Let's 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