From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web11.21252.1594737490560993734 for ; Tue, 14 Jul 2020 07:38:12 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=mw8XDTum; spf=none, err=SPF record not found (domain: amd.com, ip: , mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j8oxI0cS3LYoCtKndz5w/ZJnTXyEGgNOejgha2UNPLORG+G13i8SYXIsyYLXLzVxTCOIvVimDHD95RnHajnuLTjAzXOA+/B4k2oMLEancLwyCtphDJEoBemk1f09nzf7+RDHGAyGiF7zmGSYmZZ+dmoVuYtGy0uYijaqDrI4y/XSFRTKY3u/Urj0DGKtrx2elgQC/pal6e5yTxpbpNZjcAw0HupWkFFbONMVDZGekWv1HOHC1BOZlxBDG7/S1xyHsmKZKNB4xB/uHQqfYGeJxw+fV9vqWRxapxhmWYlvpU1TIB4EAJYhUR/RxFlAZDx1JlG/U+SHIKEi9wCQ1cgneg== 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=215PQ7ca99/bfEAHV/uLbIlFpjqLGfOl7zXhdvtrLLU=; b=bg7K5bkYqbTPxrg4xaRD7KNc9zX6pbh8GR9hXXvj/el8mM1EXEFvgxbMD+bnpJcTcK0JmTt/4KaFS8cRyo43giVpmelKRaTNs68xYkhj56Ekw1QH9B8rO6bWZ6E/dEPtAqXzanm94o3CBlZHjOrwvU0a6t07y8TLkeWXBCuh67/uWCor7wkgM6KhnQ0dJfjOyrIONhX4fmaj5ia8xCCX+ikRwdeUSAv7MIXLJN9IC8RXzI05bIkscJ1U13iutaceLnCkyh9p0Jttm6BfKmg1n3P08kDVxKxv1M7NRmxKqJjnKHM6g7hZw6AvP9vWWcPgBdWbV0nxDhIMoIaFwzWUAw== 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=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=215PQ7ca99/bfEAHV/uLbIlFpjqLGfOl7zXhdvtrLLU=; b=mw8XDTum/iZskw+dHMZOYzXRDgk5L/eEUMsRHnJ4iQK90quh8kRghv37SON3+/14/1LnCd/ReMWtnM+QgCB4z3DjLQ9do1JqEvJIIDaiLwtjYMzyKPZDev0cWEPoWWdwtyq58ISYYmNsB+YoTL5KxBr8bVjvdDNHl6ttc23HgQQ= 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 DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM6PR12MB4219.namprd12.prod.outlook.com (2603:10b6:5:217::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17; Tue, 14 Jul 2020 14:38:10 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::25ec:e6ba:197c:4eb0%8]) with mapi id 15.20.3174.026; Tue, 14 Jul 2020 14:38:10 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Ard Biesheuvel , Eric Dong , Jordan Justen , Laszlo Ersek , Liming Gao , Michael D Kinney , Ray Ni Subject: [PATCH v10 28/46] OvmfPkg: Add support to perform SEV-ES initialization Date: Tue, 14 Jul 2020 09:37:35 -0500 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR20CA0032.namprd20.prod.outlook.com (2603:10b6:3:13d::18) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by DM5PR20CA0032.namprd20.prod.outlook.com (2603:10b6:3:13d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21 via Frontend Transport; Tue, 14 Jul 2020 14:38:09 +0000 X-Mailer: git-send-email 2.27.0 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: fa9041bd-64b3-4f63-dcda-08d8280387d7 X-MS-TrafficTypeDiagnostic: DM6PR12MB4219: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ocpkt8Rv/CfS/gh6T69s28IUI/meOPUDpT0YQqgjvXN+2ZJh+5mXLEN8JIzbyVOfKF/DLKzudg6wlPvVmCQVMI/4sLgzgqAkdCCubXdypW0RafKAnJyTgg9vTOR9dRN8LzBEQBoVyIlb7Xvx+DSlEv0JbkVDamNMauMC/P52CGrJkZzV8RWHvMqVYQTiUIpyI5bZ6i5/umFdRvz+cOYRFGJFRo8DClv7gPiBsJyXvGuzLjDgRUOBmq+yPSZ2e/cxOxH3hbhgz9QDrcYslyp9GPY7rKS7TMZLPaIHD5hJrrIVny1tfwZOdB9PTCafmLaEjNywPKl8aNBubiL3JOh3XCLtmJMzfDw3icJDKJ0mp1RCk3Llzat7BIVpLc+7xI6b3+MVUf/3fI3F/rNJiDgJnu+d+JOhsft7jSNomB8qzbK3z9SR44+AjPrDVd1Pa/YVjVGaG6RUvlGc2+peo+sYVQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(136003)(39860400002)(366004)(376002)(396003)(4326008)(316002)(66476007)(2616005)(6916009)(36756003)(2906002)(66556008)(66946007)(54906003)(52116002)(7696005)(6486002)(956004)(8676002)(86362001)(5660300002)(6666004)(186003)(966005)(16526019)(26005)(19627235002)(478600001)(8936002)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 7ItEEZhx/VuX6j2iH6/C5vyb69F+/C1uHXQOXoy0wNrykVfXw1XWEyJh8n7JQp40gihV15/qIpR4ox2vuDYbrkOcOiAzdk4guhG5IY7FikONPUKplqzQwOk3pYYugcKFHRDLDDk73+hN8aa1C6yVcUGX7ADHfStrK7AZrkGh4xJ76DG5L249bQjG4p1Dfs1Y/tt8jbKp8cq6iIUfJSWQG0uyhR7GjYDdSj9JNbj3XToCc6wmodbA/G5YGFt16IDAu+8bAc9FuWImez+SVnlK+bVIVU9QN5cFI7hgvFHcH2pXaaEVuebW7UKxk5SJQwBC34uMOL+aD2XuuEfxlZF5dd80vq1gQuzx9EDJdAFs43+Ue6Vflbv/YXy6DCKvexWRufvzIlPzVppZKVsvZNcz0ylMNMzRBkaKuQXxKwsjqpWI0ydSYJ6ZiJ7d1Ed2jDGD6FoCf68Cs3+7yGxCUB87rMyMSOlnQmRegyB4l4KDQqo= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa9041bd-64b3-4f63-dcda-08d8280387d7 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2020 14:38:10.4737 (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: eZx24CF1Mfj5rUx4cJOV72g6jbbFaobyn//x+8XYYXwJBXGNqbZC9A4/nO3TmcgDUXWzRiWS8jnL2OJhNTF27Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4219 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2198 When SEV-ES is enabled, then SEV is also enabled. Add support to the SEV initialization function to also check for SEV-ES being enabled, and if enabled, set the SEV-ES enabled PCD (PcdSevEsIsEnabled). Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/OvmfPkgIa32.dsc | 3 +++ OvmfPkg/OvmfPkgIa32X64.dsc | 3 +++ OvmfPkg/OvmfPkgX64.dsc | 3 +++ OvmfPkg/PlatformPei/PlatformPei.inf | 1 + OvmfPkg/PlatformPei/AmdSev.c | 26 ++++++++++++++++++++++++++ 5 files changed, 36 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index b6f98af8183c..494b67c5c073 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -606,6 +606,9 @@ [PcdsDynamicDefault] # Set memory encryption mask gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0 =20 + # Set SEV-ES defaults + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0 + !if $(SMM_REQUIRE) =3D=3D TRUE gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes|8 gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index d147aca168be..14ecfb24912d 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -618,6 +618,9 @@ [PcdsDynamicDefault] # Set memory encryption mask gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0 =20 + # Set SEV-ES defaults + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0 + !if $(SMM_REQUIRE) =3D=3D TRUE gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes|8 gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 6db1f0b51c7c..ec11ec914556 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -616,6 +616,9 @@ [PcdsDynamicDefault] # Set memory encryption mask gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0 =20 + # Set SEV-ES defaults + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0 + !if $(SMM_REQUIRE) =3D=3D TRUE gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes|8 gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index ff397b3ee9d7..00feb96c9308 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -103,6 +103,7 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber gUefiCpuPkgTokenSpaceGuid.PcdCpuBootLogicalProcessorNumber gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled =20 [FixedPcd] gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index e484f4b311fe..4dc5340caa7a 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -21,6 +21,27 @@ =20 #include "Platform.h" =20 +/** + + Initialize SEV-ES support if running as an SEV-ES guest. + + **/ +STATIC +VOID +AmdSevEsInitialize ( + VOID + ) +{ + RETURN_STATUS PcdStatus; + + if (!MemEncryptSevEsIsEnabled ()) { + return; + } + + PcdStatus =3D PcdSetBoolS (PcdSevEsIsEnabled, TRUE); + ASSERT_RETURN_ERROR (PcdStatus); +} + /** =20 Function checks if SEV support is available, if present then it sets @@ -103,4 +124,9 @@ AmdSevInitialize ( ); } } + + // + // Check and perform SEV-ES initialization if required. + // + AmdSevEsInitialize (); } --=20 2.27.0