From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web09.15906.1621448415547919253 for ; Wed, 19 May 2021 11:20:16 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=SJ8l9xly; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: , mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AVVZnLAZSOdVj/GGt4dgREdQnVr5sJrLIrqGkutQw0J7l/unuhcbvMu2KPXk0233FGhH8zC29h/8zCg9lunhORxucwMZdvmKT7KjWCH6dD9GDlURmC22DbMrT0prOScsm76lErhDe9pU+34FREtkFLr94/ZoQ+OyDaaf4CR22g8oeElkwiFTeQn3dtSeyrmDlzYl0yeErZasKgLPjqSV+HpBFKe1uWDvKZk/u/fV8UvDsn/SNjBJrh9imAqY3FKlEDV++WVln7tEJpVrlJnUXKWzmwGUOea0wHtM5iko6YKJ9yTUBjzgdy15sNUDbcK9eC7oF7HcJ/q3ABtmXZ02aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/okNaFz+eyRjDnmLx35Ha7Jiq/QW4TI6ieKg3CSwIAE=; b=CDLdm3+gZQzFkE/kTJxrOGmuOer4dXK3aj5OfFbyRgZk3UgxunTPHfCcn30owCSpnWJXYuOEmrjBz64xnppyCsLatH8FKJYBjrbLiIGWjwHd8odhhyABXU45Hl33o4dOA17UiLHdlOpEThSCo6xv0D/u43Ntp0YQBodYhtqmEv4B8dD0ol4QOPCb7TK/Qkz4B4KJ2Mi2ciyGDIpASAf79felbtnSvKy+6GZC7pYy6xDFsVFlC5lUDzBOMi7BkaX2XDhtOVKPrXt6gAaPrETm2LomXY5M3P4RSb3CWK8NLVcSu5lVBvsUh2mhxz8rkWvPReOGKsETJoWA0pEEGSj/sA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/okNaFz+eyRjDnmLx35Ha7Jiq/QW4TI6ieKg3CSwIAE=; b=SJ8l9xlyHEtWvOYh/X5xKjUUT2UD2stGsomPE465Wz4mwSgx0uB4qgHBlWN0CJClsa3sIZnZgAOeWEC9CMatJaVWDQCwGoKfjl9s8X/5yAdNnH7uWCS4ALtKSQtCw6d5YVfPfY1UQd9xYyQZ+zss2zqMjqLve/Y5z1OrkBYTv4E= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2413.namprd12.prod.outlook.com (2603:10b6:802:2b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25; Wed, 19 May 2021 18:20:13 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4129.032; Wed, 19 May 2021 18:20:13 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas Subject: [PATCH v3 10/13] OvmfPkg/AmdSevDxe: use MemEncryptSevClearMmioPageEncMask() to clear EncMask Date: Wed, 19 May 2021 13:19:46 -0500 Message-ID: <20210519181949.6574-11-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210519181949.6574-1-brijesh.singh@amd.com> References: <20210519181949.6574-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) Return-Path: brijesh.singh@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0212.namprd04.prod.outlook.com (2603:10b6:806:127::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.25 via Frontend Transport; Wed, 19 May 2021 18:20:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 31cfe44a-f6ba-49ef-3028-08d91af2be57 X-MS-TrafficTypeDiagnostic: SN1PR12MB2413: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CFsug85nxLc/EHVj0Xi7AXt/hixlKPh1wzrIqCqdIMLlE2ufp7Y7IQ9JYGPfvKSNz5lDM3XURPeQiAWks/a9K2kFlxmfjGqqq0SliZVeHtWBeTXHZQiNN1PYJfJsiAW8tmOf6ArYUph8DZnk61f8mxYTHYYxMMD6+7s6RhaGuCnHzZYBYvfA9d4J30QHJ86104id8YgcvoqdQ8FJ9BFV4bBJ63h1TffIRgjuTG1mDyRGLd5ZyKOaou5+dGnOxjIncVw8/z2nOxrohcNZWODinEYjDS1glRU/S7BusRYhqGNeknbeAEfc5QeK82bV0lvUtkVplAPAAlEoAcjvaWPNlzDG8MDbBd5DA194PJzdrOBBFhC6zF684IiN3p1DVOnMtOjJSgAADyyxPrZyWFXv5zWmlpRIPJeXvhg9RYZx0LIxe6Q4lJGCn3jIQECL4nYu/TdH/LYSR/i3r+oYAMO0TUWa0Y1RhCMfQOCeNK3Yz/f+Cl/HTE0H9LJPfM/LeoXPgVdz3zYIBwhkGvn3VLKrWMOVyWUTGPaihNfWmUqrkNI2n9OWVzQe0j0qfQ+xmfrGQwc95EmxmO8ifGH8oQ5X7+t/TiA9N3YBKspyfBiSUCkn0iBf1vpvyYqL34JbKQXmajaZaTZFSK7oAYNg+cmaFbos/9jMpCiAwRlVpFg/35oCyjiq1pxlHmAObL3dPVcLtF+Q3zRHPwG9Y1Wp4lfYtTxnHu9oXr8K7WuXSPVIbYcxE554u9iIQOEgtPU5RMJtewXY/U9g1MwfDnDSAIATXg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2718.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(376002)(366004)(346002)(39860400002)(136003)(44832011)(1076003)(54906003)(8936002)(8676002)(26005)(186003)(316002)(6916009)(5660300002)(38100700002)(16526019)(38350700002)(2906002)(83380400001)(956004)(2616005)(7696005)(52116002)(6486002)(66556008)(86362001)(36756003)(6666004)(4326008)(966005)(66946007)(66476007)(478600001)(213903007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?57O3VNErxNOgqhQ1+dSGXLi8BPMo8Hca7HiCL6caI7frsAhFf9cu2m7smBl6?= =?us-ascii?Q?sEe6UiYim1VyBbIf0rT370bK1S1cEQZpUL3oG0I5MlHTgkCZ2p61XDWxaZtF?= =?us-ascii?Q?KHhV4m2U1lwPD1UJ7eyVAD30Sa/KvBO7dwTYgP445AGqwJxss6PTxeEX3Cv8?= =?us-ascii?Q?toD444rOsUZ70MzAIvjjdIkxTASbHvtP//4Ae35Nn+v4MzCCebR7Pzb1EjBa?= =?us-ascii?Q?rT0paQS4OAr10HZLYOgFdROK49TtMtFlxam2CQPAT4YN59q5qV1AN93rkCdr?= =?us-ascii?Q?iz4JXnC3f2eMWiaEg6vI9wcTO1aeVVrg+uPvu3UTpkFQTB2wbzwCUw9R/hH/?= =?us-ascii?Q?g8dGBW6la3yNqRDzyurp8gsZRXt7Lw+JQKVFixzkF6tM7ofmG4+bUKptquok?= =?us-ascii?Q?2px2+qwd2HzkaPmO+xEo894uUZS7M9DU2TMwfLPGH7g0BU81TrwhZqEASyRT?= =?us-ascii?Q?uchY3VMwdXDPSuQa3CE+XteYv8TwXmX8B6xtOTadbyXCkjd7Gcp5xpeZyRLa?= =?us-ascii?Q?ZoeelpMHPoHBaVSRDmICpEUSNz1XfA88O/sQesZ1XEVjwOoBP8Pl0fIUM2sf?= =?us-ascii?Q?NVaHwyl5KuLQVpOxj8bWrhRUfFGZ9aH5ROmS1Hi370Lb9Y/qX6hr2l7lPmYs?= =?us-ascii?Q?giWoK4iyJy/76n+Y63cftUVQfE/0MaNx92HCpSQtTZKc9MVfug91CSJB9XQq?= =?us-ascii?Q?rahWCn6AzoomxoQTfxnDXR5i9vedFj2FmRUVY973TMeSOUd/ovXuqV176kLs?= =?us-ascii?Q?+AvTAqJ7yMfgUQqNBG2rgSzZ3RwEe3o5gZ2uXcAxQewiTONYM3Q5vCq97BAu?= =?us-ascii?Q?A5YN7bwIApD/SDPe9e524ApWT1pNR05iP1i9HJtBacakATDbMu0Iwx8Z4Ekw?= =?us-ascii?Q?b2WoY/SejLLlNCZi/5AP4eGUO1JCjN1AeBLio/oWXsleOQAqY89EbtH9VQwW?= =?us-ascii?Q?2o1lWF+H1UgwlDIzGVDC2wOiRFnSIoprld7TENO2shDPVy9fgDWSe39mpdRs?= =?us-ascii?Q?jsToAPCAB8TQ5Qwl8u5DEqCnVvYeCXvL9J7lx4XbBaP7XYsnf2FpyjMVaRMR?= =?us-ascii?Q?Wn3eJ34cUL0KcJTh0T5T5oN8L4BUlHXGMmag2FVhiscZ9K1tKzXWtX0eNrIV?= =?us-ascii?Q?D8Y0rELGmZQnMsGwJvHlP4oIyxmn8T693yHxT3KARfQMKkGVZ+UI9F8Lt/IN?= =?us-ascii?Q?SLiulzN9jYhd7zGOQCTCbpbJ+VvHqZg7AHtYViCPH1xcSB2/hw5r9abameWs?= =?us-ascii?Q?RFdDvqlBxKZFCuXbmQ8F3Ube1U0GEXqSwerAbrQKYtprxrXXeOjuk/QATVif?= =?us-ascii?Q?zus3DovUrbnlfuvxf0WP5nUX?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 31cfe44a-f6ba-49ef-3028-08d91af2be57 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2021 18:20:12.9137 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tV+h6rVWLAcI4xU9uSZ/ENnpDnatMdADvkfLaGkXLImmYsbhkk/wQqzgJxgyVRmg+klktg8GyUKrxOM23u8SoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2413 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Use the MemEncryptSevClearMmioPageEncMask() to clear memory encryption mask for the Mmio and NonExistent address range. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Reviewed-by: Laszlo Ersek Signed-off-by: Brijesh Singh --- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index 689bfb376d03..80831b81facf 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -53,11 +53,10 @@ AmdSevDxeEntryPoint ( Desc =3D &AllDescMap[Index]; if (Desc->GcdMemoryType =3D=3D EfiGcdMemoryTypeMemoryMappedIo || Desc->GcdMemoryType =3D=3D EfiGcdMemoryTypeNonExistent) { - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, Desc->BaseAddress, - EFI_SIZE_TO_PAGES (Desc->Length), - FALSE + EFI_SIZE_TO_PAGES (Desc->Length) ); ASSERT_EFI_ERROR (Status); } @@ -73,11 +72,10 @@ AmdSevDxeEntryPoint ( // the range. // if (PcdGet16 (PcdOvmfHostBridgePciDevId) =3D=3D INTEL_Q35_MCH_DEVICE_ID)= { - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, FixedPcdGet64 (PcdPciExpressBaseAddress), - EFI_SIZE_TO_PAGES (SIZE_256MB), - FALSE + EFI_SIZE_TO_PAGES (SIZE_256MB) ); =20 ASSERT_EFI_ERROR (Status); --=20 2.17.1