From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.42]) by mx.groups.io with SMTP id smtpd.web11.1822.1596134920161302766 for ; Thu, 30 Jul 2020 11:48:40 -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=I2d45D5R; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.42, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j29tQu0+rBD1wO+fY4/PBMwRjU8K1i+NqB2y1LVCillnStF3w4c4CGzu7yPSDGze0KhDRTArbeIMQ/EqLAFSASeuAhtV/Gnh3RgTe7m5hgl01WFMa88us1l6RGx3P6VCoUKfZ9kGOiYvbcIV0l7iWUBLhX6AEn646h4ItJCtiJlBSN8e7guKCjbobByhxgDZXA1ZRKfAYUZfpXzBFp31O8z683Q03q3roUpyqv+k1zCaI2eM98CvYVuJAQ0qTYtibFbWFVVhMATWTEv1mneGCuBrlZroUJwsnNQ+dc6a29HNct/MNatj04LO3dAqb3gpqxBOqgCFN/e7cy964Rd9tg== 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=LxRXP3mF9FmwbZY4aJbmVFgpzrJyZYFko4J8VkDBaYTmElqiUAKu7rCIFt9O6cKzbyOaX1W3szinpe7E5X/OAHwKPTzfOgmYbu8y1A5t9Unp/orNJsSWHYTcmd0oXtruBfznB0AXRjSg7/Hywff0k790rrz3HQYR2PguJVQYwyFBjJHnR2lNLQb6IRcwqN8hNbz94IM5jfIwZiqLxnSLEKdNo7gADAbLP2SldhsPM3aJSpbFfZcd6qdWp703HlOEQDOkLl5B97MeTaXXNDM3xU7MVYt2VeL7+3eUEnOftvkRqjXeh6XclcUvBZeEAfTle3yno9anvlyNLynPsIfymQ== 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=I2d45D5Ro91KaqzhhAkKQkU9gJMn+x8dzpbqXHL+dfvxxiu6Bh174U7UEfa++5k5ojgEF7zVAYt8o2ht5Xnn+zh56BlM482/iBXl/VaYvqr3qX5Ja1vnbJcVQuE8wjl4HSnubPR0PfcEn51GJzk/RwKY3O4vSjzgt06NiQgjdl8= 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 DM5PR12MB1867.namprd12.prod.outlook.com (2603:10b6:3:10d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.16; Thu, 30 Jul 2020 18:48:38 +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.3239.020; Thu, 30 Jul 2020 18:48:38 +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 v13 28/46] OvmfPkg: Add support to perform SEV-ES initialization Date: Thu, 30 Jul 2020 13:43:40 -0500 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR17CA0051.namprd17.prod.outlook.com (2603:10b6:3:13f::13) 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 DM5PR17CA0051.namprd17.prod.outlook.com (2603:10b6:3:13f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.17 via Frontend Transport; Thu, 30 Jul 2020 18:48:37 +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: 555d5233-deb7-4bf3-74cf-08d834b92bc2 X-MS-TrafficTypeDiagnostic: DM5PR12MB1867: 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: +wI3vH5ljhAnm+yFNeLI20xe0s3rMOkmyLgQ0uFwlZwEJDGAl0dzcH75RZJdB4YYE0GJtoQeE1i05bO4ULfI4uPzCyiVNARaAA5dOwqKlJb0qyidHgJhR7Zp+bmkGQpEKVKozeyMCNvKEb8Lv7Kh+Id0HpK+7RN+bjzBNIguDitreNoF/rtIpPJNT/eHS+O9bohkL8RPwqlGkyClSWZqXCfdltu494ZzTWErq5plOpXxz+KZTJyzRTfdEYd+UmPwCz7KV65vbPokYuPLLEzXfioo0CJKkArrm9dtc6yEYiEe1gji5s52CxdkiGpsKxfUPw8+Rf0vymYW08VckAvrBLo7X3MeI21yEkaPF/iOvkQo3pChr2QX+wUry77s/Nl+/W3rCo3DfTmzX55CbcXBjq0ouNFrtXCbo87/7RCmpgbNi7cumwNjZTjKAIXdB4Sf7uIt4Lbc+LTJoYZl4n497Q== 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)(366004)(376002)(136003)(396003)(39860400002)(346002)(316002)(7696005)(52116002)(19627235002)(54906003)(16526019)(186003)(956004)(2616005)(26005)(966005)(4326008)(478600001)(86362001)(66556008)(6916009)(6486002)(36756003)(66946007)(66476007)(8676002)(8936002)(5660300002)(6666004)(2906002)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: jhpxy5t8gQVuT5ICeckosAJ0OKfMryTcw9fSnltjx+ROJwXfFbrqkmDNjgI3Qy+XZ0sKrip7SLiblPh/mMGG3klXwm40hfpzLv0mwL9XV855CsGilvDNvgvQ497Yv8XPXb66jlwgRgdk/RjrNXHZvkmgpjPrkNdQ4+6I+mMV8vz3eohLjii2PLpdY5WF/HugEpiVmsPivVhRM/R8Of4X4kh9/L7hMgmgvO+6HCJ8qHtD1GlbvtLR84YINkh99gZ//welW/qOcKHFODIrgfuAEvaxzvPnB9qUGNsSPLDU2hgrHhMZXTfu6TKoyIgzA6slmy7LOAYfjnZp05FiCG46CyyN0fWhSdwVcmpLxn0vTXUUuD//AaHklL7DRMPFLdYnuLUU3WWDWDIhsr7Vi8kSQvRZM5f5eVKvmPT/Ivmwu6dss9sg620rK8bTbQUHj8LuxN4L1fHilFhnP1NsjjvrRhDazrFQhxn+J+egRcp5JgIGcVk2U5scZs4eqAsWGN/FDpr3jegE7HkWypEidZ2HFkkmC3Kxty0eTh0+28u1Ii8Qygq9p2+4awE4/m4NFxiOgVJZuqwByL5f9O32Kaph/M2u07fnLJVmjq/IPbkOGLUl9S4BZ92N7FmFn24AhOcJzAXpruOB9KdU5e7Sjih+OQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 555d5233-deb7-4bf3-74cf-08d834b92bc2 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2020 18:48:38.4421 (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: /vOpDgTGaAaw1gbengunoRQ9UAF/Dw2WZTKRnvaKiXAF67U2GJ1bmE/lbnfR/Zwaw65w/QBNAnSBKfc60dTGDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1867 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