From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.74]) by mx.groups.io with SMTP id smtpd.web12.663.1583190475073675600 for ; Mon, 02 Mar 2020 15:07:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=rrSp0AmU; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.220.74, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YeAmStpv52TRlPRbySz7qrNM3oJfVgRAe7S9QVR8CFP6HPppTn7PpMh5Da9C1Sf3I/GmK4fCt7VgmFyC8tRPgNwZuGrI2gjfHC0BPXD0ZCcstBGabp4hWJSeFjBE+jBfv37aBDK54ikZO32UscCy3rcd/2M4ywtAhc7VprE1HPmkBFQHNiVm6fDN/uykPg6tsny5Y5lkUh1GUr2y5rnLm2izqD16AdyPSBTov5AHj5iPWo73/jGwNqEe8Su3a5qETFZC31giPTEaMC4HrJ3z8/9L0v8JLNy5jV30+m2ZIuEXIiRS8gkryw/qaXAlU/1g96J6DiEpAL+70+ZFJ7xDzQ== 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=dnGnQV8Bj75A99imyiRPhdLBtpPY0tCSB85YpAWtZTI=; b=F9IkOm4B/cI/M/wJEadpx2vy812a6UH3bk6xhBJEQKf35ctR35+xariqzRuYQYzyw37nVo3E4RSwXZAQROfAyrEIYriEnDSparxAqDKyZ3z1cxJWIShhU+0Y9iERjlraaydilUQKht5B/r7d8k+ivQ3TY6xZOhwjJdgl6F6S1Dl5Rn/lM+Wzag8uCOvXgPvOhJSrs1ZYbDpIsJ5gOuO7U3tYUhK1QO1ULFMDu2EiVH6mssr9SnpgWRJTy0OQZSgnDoS0h2XEr6/XPm55AJ1bsKYAkiKtwgj7hhAZL9JaBHjsCjfQibHt+DAZFEauftQh3trFDt97ZdNl5Az0vcd9Sw== 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=dnGnQV8Bj75A99imyiRPhdLBtpPY0tCSB85YpAWtZTI=; b=rrSp0AmUKofaNdXk6aFUVE6KfX8OpIVqw/ddXvr29Sa82KddeBpadiW8qBR40hHCjkIQX/KHMPoNonMcC3yFHD9j82x3s2V4RKZW5ouzv2tCo0zHmpL6i9CuZUPL+4JBauMMt9GvfkSnoWktq/19f1/Z/fwQEQXTQ10Dbk3PoTk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) by DM6PR12MB4201.namprd12.prod.outlook.com (2603:10b6:5:216::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.18; Mon, 2 Mar 2020 23:07:53 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::f0f9:a88f:f840:2733%7]) with mapi id 15.20.2772.019; Mon, 2 Mar 2020 23:07:53 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Michael D Kinney , Liming Gao , Eric Dong , Ray Ni , Brijesh Singh Subject: [PATCH v5 26/42] OvmfPkg: Add support to perform SEV-ES initialization Date: Mon, 2 Mar 2020 17:06:57 -0600 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) 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 DM5PR2001CA0013.namprd20.prod.outlook.com (2603:10b6:4:16::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.16 via Frontend Transport; Mon, 2 Mar 2020 23:07:52 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b8ba4907-863d-4eb3-bdb5-08d7befe895f X-MS-TrafficTypeDiagnostic: DM6PR12MB4201:|DM6PR12MB4201: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-Forefront-PRVS: 033054F29A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(366004)(136003)(346002)(396003)(39860400002)(199004)(189003)(66946007)(8936002)(54906003)(316002)(81156014)(81166006)(19627235002)(6486002)(6916009)(66556008)(8676002)(4326008)(66476007)(52116002)(7696005)(2616005)(5660300002)(2906002)(36756003)(186003)(966005)(86362001)(478600001)(16526019)(26005)(956004);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB4201;H:DM6PR12MB3163.namprd12.prod.outlook.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-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S416OsW2jD8AQme90G0ivGFrw3yo7L+oyFWwT5CTVLZqXFku3bMl3BklY/stLRjCWVbcfgqTnikWTUJvY+bGTELBk40AXYPD4R/VRaCiRt32MW114LgvxeUxYho3RrYvNpN8rLONk6ojYj80yBjgrlHZeASl6tKXy8kSiPLnSBhY1k6pbTdV1yE7Df7wkkAi4qEPneLR5TGYAOqJvu8wtL4AGa1zjEEu56DUzRhC2chV7DoBz8LtFOGkTRxPLeoHNGaZEXr5z/QpISmClTVmWT/+ndwQx6kD8QP8Be/cNdENlNN/xhJJYLSHcRN+sequ49HWR/hVdStH64qTuo/eo/ULhNVjctjaFphFTiyxhGtXQtUE6nBmXitn0tU0GQiR4aXkdvMYco4ZUuzibJv83mvnSTHqGtDrvMMq9PAh4EpmTRFaI4mC7wRFIu5wAcrk9MgNMhUllb55Q7QdWKdToSlzlQuQ57gmNvYp3iTrbJahucYLHqBlpG0D7JFb1uaN92XPldxX2Yab6lF8Empbbw== X-MS-Exchange-AntiSpam-MessageData: roTJeBbKf5SOBjhj3P8o9Tp7FZZ+TiSTiqTDlz5cH839fuC4uK8Kiwwo9dafIGMlKAkmrlOKejwlYPw1258L1ZwD7aoSAYIkzEIaL+0HDkcwfW4bZVhQ+Qu2X5v5VM4ZYmJpHuWkmhjIeUFVTdsjWw== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8ba4907-863d-4eb3-bdb5-08d7befe895f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2020 23:07:53.4136 (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: Q3d/34UgOPk+UbwFfdjAyBPLjzkJIW+MZDW51CfXPZBbloqO1kzf6LPOLMXy82V1lgZB2BDc5mw0EfXCGYc4JA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4201 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 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 c842404287dc..6eb3817909f4 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -567,6 +567,9 @@ [PcdsDynamicDefault] # Set memory encryption mask gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0 + # Set SEV-ES defaults + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0 + !if $(SMM_REQUIRE) == TRUE gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes|8 gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index c082617be9d8..fa521321e2b3 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -579,6 +579,9 @@ [PcdsDynamicDefault] # Set memory encryption mask gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0 + # Set SEV-ES defaults + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0 + !if $(SMM_REQUIRE) == TRUE gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes|8 gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index d3a96e5a7be6..dd6f86fa087d 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -578,6 +578,9 @@ [PcdsDynamicDefault] # Set memory encryption mask gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0 + # Set SEV-ES defaults + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0 + !if $(SMM_REQUIRE) == TRUE gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes|8 gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf index c51a6176aa2e..5b2585a4f09c 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -101,6 +101,7 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber gUefiCpuPkgTokenSpaceGuid.PcdCpuBootLogicalProcessorNumber gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled [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 @@ #include "Platform.h" +/** + + Initialize SEV-ES support if running as an SEV-ES guest. + + **/ +STATIC +VOID +AmdSevEsInitialize ( + VOID + ) +{ + RETURN_STATUS PcdStatus; + + if (!MemEncryptSevEsIsEnabled ()) { + return; + } + + PcdStatus = PcdSetBoolS (PcdSevEsIsEnabled, TRUE); + ASSERT_RETURN_ERROR (PcdStatus); +} + /** 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 (); } -- 2.17.1