From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (NAM02-CY1-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web11.13475.1574280499527396450 for ; Wed, 20 Nov 2019 12:08:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=VoCXU00m; 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=NmvvF1RUThGvko4dHNN0bmo6iPS4F8MXrJIB8M3yoXWQb+KD848MtutDVxP6llvg8Np567oTLun2veKJ1YPq0m726O/LVT3cJCJ2u4ICnKdjy/CL4uaMsKD0QK8k1T/1r2iDnHDHV3E4nQoG2Yz+VgH3p+O/XMI1PvVTckNQvvKKBr8egWLIYC6SQt09nmi4gJjuCAwDxGHPxwa0FuLzKv5CjYzkSRza2mmD3up4zhyPEQF1wI1N95+iCh8oGCBtfQELKijaYNVsI6ew8vSQMKuiAGycZ2IgD6HeSTYxzMMWlMC4cf/OhwbCuUZQiF8HadjFOjAeMCjpG3eL3TIPtA== 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=qhuMTY2mG4esmbvEcARBbgFN7rAPqAj9HmGuV8wKVSU=; b=GFEmwQCKOnPVOfobC1B2YSTRc2Ic6avBiAJl8MujFP2Hvf/gtDFPbcZnJw1fxYVh5q3h8UoIpmbxgaqr1hVcZyOKtYispyNufdoLbeuPaisR3OmbjJmClTh/rnylsu5Tdh8agSr8LY8KdH3E+/L9UlYAMeMCdhf11t89eFoEGxlgpS259UIXAX8yzKes/p8XQ46mI/JnHR4JqATObkTJyrEZWtiS+mLxzpdtY4hBvXNWpgYWw3jPOXaCljMdzj3skNA/XGE94xr8CyTgaTpX6TVOu3G57GfYbjJbkRaUnCYVgDzfv+c/iLtF8hLCuHHKHyIEUhwIrwGKo/eYsqHvUw== 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=qhuMTY2mG4esmbvEcARBbgFN7rAPqAj9HmGuV8wKVSU=; b=VoCXU00mgGnyZaHCfA09mmsrixJGv+pmQi9v16E611QZykl/bNTCgrSx8RyBw3/aupWI2Fvm3JllxMGP7zSjcdSv4yPFOFMKPVM1AxXaBaf1JDGqFss4KekPeXtjA4R5MMyRIsnRLQ9qJoF4zBGUM0qoyWlkHkUb7qR4wFy/+fU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Thomas.Lendacky@amd.com; Received: from DM6PR12MB3163.namprd12.prod.outlook.com (20.179.71.154) by DM6PR12MB3675.namprd12.prod.outlook.com (10.255.76.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2451.28; Wed, 20 Nov 2019 20:08:20 +0000 Received: from DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::dd0c:8e53:4913:8ef4]) by DM6PR12MB3163.namprd12.prod.outlook.com ([fe80::dd0c:8e53:4913:8ef4%5]) with mapi id 15.20.2451.031; Wed, 20 Nov 2019 20:08:20 +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: [RFC PATCH v3 35/43] UefiCpuPkg/MpInitLib: Add a CPU MP data flag to indicate if SEV-ES is enabled Date: Wed, 20 Nov 2019 14:06:57 -0600 Message-Id: <195851106387c3b63780c6c1b04e14438d6032a5.1574280425.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM3PR12CA0087.namprd12.prod.outlook.com (2603:10b6:0:57::31) To DM6PR12MB3163.namprd12.prod.outlook.com (2603:10b6:5:15e::26) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 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: a4d9de56-bd4d-48d8-845a-08d76df55289 X-MS-TrafficTypeDiagnostic: DM6PR12MB3675: X-MS-Exchange-PUrlCount: 1 X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 02272225C5 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6029001)(4636009)(136003)(396003)(366004)(39860400002)(346002)(376002)(199004)(189003)(36756003)(6506007)(51416003)(446003)(66946007)(76176011)(52116002)(50466002)(386003)(478600001)(6116002)(3846002)(14454004)(48376002)(5660300002)(966005)(6306002)(6666004)(14444005)(186003)(26005)(6512007)(19627235002)(4326008)(6436002)(2906002)(6486002)(99286004)(50226002)(2361001)(8676002)(81156014)(81166006)(8936002)(118296001)(2351001)(316002)(86362001)(6916009)(66066001)(16586007)(7736002)(305945005)(47776003)(25786009)(66556008)(66476007)(486006)(11346002)(54906003)(476003)(2616005);DIR:OUT;SFP:1101;SCL:1;SRVR:DM6PR12MB3675;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: tzk7NTdoDO3bHGnpm2rParFJ1ScChapP9eIQtM/XJCg4MPCCy3HHIKWi9KhIfDB3UhuGSzt4+xFhYo03LdMoH9J0WdlW0PxXLH8AUI6k7gQ86VBRXJHix7CqAAxyx/fawY14WqOHolA1Bf6HOJ50+NMYJANTxidejyBK7EH4e7OtsxVSfEejbJ0/SJRc2EqUl5OtwlenwitOPc/UCR4Ha7RFcW0oiVndTkskErrWGSGpYLla7kTkLPxYGrJZJrExc3gW8QFVoE+kufAX+uAHz36l2Yaxzmrj9KLJ2TyrnY/Ukg1O7z7r3Lo0S8Y8BNZPvLuVYHKPE3XUrLdnPbWSNBrOgDksKibF9XK0VUBzBWZiS7k40VtdF/puLLFZwj4r7t3x/kMusirtFyWWYHzeqET2A5Cx4L87R8FWZE/RwN5DvoUpillVSxWhFjpMsBo0x2dyYFhC47ZFOPMk90/1h6MokrjeBiomv+m3zdwSc+Q= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4d9de56-bd4d-48d8-845a-08d76df55289 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2019 20:07:51.6942 (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: oq1e9KgoBNVp20A6sDomQxXkqJ+k+GN8jCSj+dBzUX44Tff/+axCCqDERKhxPlz4v5Zga2MirQaM7I+/4f3uxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3675 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2198 When starting APs in an SMP configuration, the AP needs to know if it is running as an SEV-ES guest in order to assign a GHCB page. Add a field to the CPU_MP_DATA structure that will indicate if SEV-ES is enabled. This new field is set during MP library initialization with the PCD value PcdSevEsIsEnabled. This flag can then be used to determine if SEV-ES is enabled. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Tom Lendacky --- UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf | 1 + UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf | 1 + UefiCpuPkg/Library/MpInitLib/MpLib.h | 2 ++ UefiCpuPkg/Library/MpInitLib/MpLib.c | 1 + 4 files changed, 5 insertions(+) diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf index cd912ab0c5ee..f84dbb09ae49 100644 --- a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf +++ b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf @@ -69,4 +69,5 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard ## CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdSevEsIsEnabled ## CONSUMES diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf index 1538185ef99a..9c1215ec75d0 100644 --- a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf +++ b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf @@ -60,6 +60,7 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdSevEsIsEnabled ## CONSUMES [Guids] gEdkiiS3SmmInitDoneGuid diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h index 8fa07b12c5e1..c10fe894cf9b 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -259,6 +259,8 @@ struct _CPU_MP_DATA { // driver. // BOOLEAN WakeUpByInitSipiSipi; + + BOOLEAN SevEsIsEnabled; }; extern EFI_GUID mCpuInitMpLibHobGuid; diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c index 49be5d5385d9..aa25bf9b3671 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -1708,6 +1708,7 @@ MpInitLibInitialize ( CpuMpData->MicrocodePatchAddress = OldCpuMpData->MicrocodePatchAddress; } InitializeSpinLock(&CpuMpData->MpLock); + CpuMpData->SevEsIsEnabled = PcdGetBool (PcdSevEsIsEnabled); // // Make sure no memory usage outside of the allocated buffer. -- 2.17.1