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 [40.107.244.42]) by mx.groups.io with SMTP id smtpd.web12.5645.1595366614542794575 for ; Tue, 21 Jul 2020 14:23:34 -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=I4DcyJt1; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.244.42, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eb9yLYfXezB42o4dAVLS+29TmpLaFTAQHv7yYaL8S3lMuLjldCoYmdTd2Q2Bq/sPYHl3n6Is+uCr4leg11XfQj8U4CRSP+E5/Qyo6dchyg7+6jgmxFQjVubB9vt54Rp/g8M2B2IxNnbd3TQTgVEgG3Pqvpkv6CoUMwtITmf4vKZYKphuZQlziTRBfeekmXJ0L0iTP6cJi+meVjSq1MMHtfDxlid7m5YfJ2maFwBqZ1/aDS6yRgjXNw/bniMG7bO74ffYpPHwiEDUGMJcBADnputVjG7wmIuzGCsHX0v5mnFjp1z3qH34unKXzHJA2xEYJqGt1Nw4w7ocsOuvZJCpQw== 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=tpMCGKkJ/vd5g9S5fco/aQoufjhaVtd6vFQYZt6tvPo=; b=js9icTynN4/EQ6GW0R69TLNkyL+oGZD51awsD6LF42VqXFrxeKXBTuouriV/EzmD2T37MI9Fas0MewzO/C2C3uhFFFKm9ZAVgzL5GVJw6AqhrLlQVFKkyZDOXom5YISAP7SI1TBzMcprXZqHG7DT1ulJ0uUIz8HVDv5+MSw7y/OAO40AcyjVqhyplvI0wbnxrTeVQlBvzjxJc0uE/rkr/4oloOOQ9m0o7htAHl7EdYrWz1MwG82NdRmc61xYH37BaXZR53cOhM0f24vzpzxwTXrmTRmyEG8XAJy7Qj6Z/DnF/zt1/SYj4MGwmtWKt2KeMDDfmhvB5WR91fs8xFfWZw== 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=tpMCGKkJ/vd5g9S5fco/aQoufjhaVtd6vFQYZt6tvPo=; b=I4DcyJt18Ssqx9par3wR78TuEtZe04gmw1/UMoBoAmN47CI75k/SbUVFfOb0L+2gVQWVorLJiODUIkc18N4nT5Pd/OKT/Ei86YLThEbTJrV2Ev1HWiJ8Avhmf2loIeBhOeHaj6wW5h76SEaYPirN1CXh5VKVXvUoOfwd9Buq4T0= 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 CY4PR12MB1352.namprd12.prod.outlook.com (2603:10b6:903:3a::13) by CY4PR12MB1143.namprd12.prod.outlook.com (2603:10b6:903:38::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.25; Tue, 21 Jul 2020 21:23:33 +0000 Received: from CY4PR12MB1352.namprd12.prod.outlook.com ([fe80::9181:78bf:bf0:702b]) by CY4PR12MB1352.namprd12.prod.outlook.com ([fe80::9181:78bf:bf0:702b%5]) with mapi id 15.20.3216.020; Tue, 21 Jul 2020 21:23:33 +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 v11 28/46] OvmfPkg: Add support to perform SEV-ES initialization Date: Tue, 21 Jul 2020 16:19:05 -0500 Message-ID: <14be6eba14cef5469aefd825d2ef0ed58746b9ed.1595366363.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: SN4PR0801CA0018.namprd08.prod.outlook.com (2603:10b6:803:29::28) To CY4PR12MB1352.namprd12.prod.outlook.com (2603:10b6:903:3a::13) 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 SN4PR0801CA0018.namprd08.prod.outlook.com (2603:10b6:803:29::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.20 via Frontend Transport; Tue, 21 Jul 2020 21:23:32 +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: 05b1ffbe-6262-4f9e-abcc-08d82dbc5241 X-MS-TrafficTypeDiagnostic: CY4PR12MB1143: 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: O/peq+jXXvEFtozKJuhme/ZlEC0jtfp5IdYqPHWLdLzuGkPl2tunEw6slQ2tk+MaApR67wsCxi318PQSzXYd9JoWxvFrDUAizP+hEyOKBVIfCzayLz+lHGvqhAI0oFMWXycRPICeuPTxKgbGCR6ztAK/YBhtrkRNbNqbBIXlMIfqDiVmlSQdSu6L57a9g1XHfYmX1V/19gz1nDSV8Bg70z9paQX2iUCfjxcXmdG750lPYIt6GfL2iHGrHrvVRwkHB/l26PZy/gRTiQQNXSoHqKcePPZ5Z+80Sm90up7QCc4W9bOiQVNFUBnpLyqjcPdLM+WhricaXAh6LI6R6ca4ZttMYjnRFFIsGQjyhhKeNTPItmf5xpfg98cXd7NbgSMyJwCQcL10+nNjpsv1C4L6+LIkDCT03hi6oe4FddJn9eyXFsmhe9MLXJ5VGOFK8xYvfCkKVxcHlYrZgG0AGctd6Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR12MB1352.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(396003)(346002)(136003)(39860400002)(376002)(366004)(966005)(6916009)(26005)(6486002)(86362001)(8936002)(2906002)(66946007)(36756003)(8676002)(16526019)(186003)(2616005)(956004)(54906003)(478600001)(19627235002)(4326008)(66556008)(66476007)(7696005)(6666004)(52116002)(5660300002)(316002)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: U2IP1rtGlSAF4eDQpdAyT3J3ryOQLTz0Aak2M0BNuVHjlBd01AHaMqvEpcTuMTir4Q3ZE8gtUTHZRLHZzM0da1oS/BTCXOoH5MkaqOLaP/2VbGrMJpfD1FUDjtqgmS+T4oHBmAqzox4MY0RdHlwDL+BjpL+xnMNs/KFf7p3IeDmpK/veivT7BMvebTsXTed5dGA8qI6dFCeOuVs05NbSIozvutn/f2Bp4vFQ/xDnNcTsi32jQFZb27I14h6c6roAgPzCP5bITPbhlAjtQnOC3jOudwG71fWgOe//iSpA8UYH8AkUNWOH6t159UUfA/pOnMCYrlIJBkWUpuV1iBs+DISVnnUkhkbnfS7GfqMtxUimdy891bb9q9Qbqx6m41xKgLNpo8zj14HUf4nqY3PjN7om0xt5K+GpABrVu4Kb5Mraw6GfZNv2dxwAl0R+SzZZ1equM304Uufm5Qf5/blSm/wNY9DTo21cdHSS+YfdlqY= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05b1ffbe-6262-4f9e-abcc-08d82dbc5241 X-MS-Exchange-CrossTenant-AuthSource: CY4PR12MB1352.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2020 21:23:33.1751 (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: INmg+qKFodd7C3cQzlwrtRfGhtWLSa9/nma8JGFyIXYrI+JRpzyhYkEBgRbJis6PLcIzLVppumTnivK4yRLuAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1143 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 c57bba1ba197..f84f23f250ef 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -607,6 +607,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 22e930b12b9b..a66abccf8266 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -619,6 +619,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 60be5eae3d2b..2a8975fd3d29 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -617,6 +617,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