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.76]) by mx.groups.io with SMTP id smtpd.web11.11820.1595390771099770677 for ; Tue, 21 Jul 2020 21:06:11 -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=cxTZw5ax; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.76, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cRIyLVu21Xh7z52p1P6w0FAv43WEdZNoJphtOB3tcCCBJ4EYvE2IjggOx4RBNsOGjP/LZgxMY/lXYYNygj3pJM9WsnvW//LAydpowF2ejsCuoyRsbJLAgVPsqHZ6L7JDaOMik9g2FWH6k5Z1iHs7zX8xuNw6BaF/5lpYjbYS5knbf5G8Yo5BFnU3L3bH916Wd/cHIWPCVSz5DEschgEnqQmnpsgdgXb1r0t84NArpALCoX5c+gXPKyzzD5ps6jkcNvFXUi+pMiLQJ7l6PLRM8C+03gjRGmi0s4A4vNIV9+Xf+4cutFPB8xiPY3oX0ac4vWiyllZq2stXcp4jk8rzyg== 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=2xL2RAVEP5XW/LxYrRr+kHwaYvf60goYc3Dt2uOHhXI=; b=c28OFY15DFboTaBYuVM84fOygKq8F2iMUyrsujGtOsA98oAMjI7zUUyPxlmZMfzQuipnahnAU1i4t+YbM9hZ34X5i1gmIoisjy55mxX9SBiEoUYeYiFuk8OYTATZn9QfJlqx2ZpnRKIDqzaMpBLlz+BXQNzu9eXeiPTjSkm0NxKu79w/hFYk7uX1t0koUWYME0KtpPhW96PFDDqS+OSS1Mnb6baxrqNxdZid5o4J/iRG3dc571XV8eOX9S/zipHYLJM07AcTriSP9NRcXuiOTNPrQoRS9xlSBxo1d8wD7CAGfNUBId99E+2gRamnko9I8KL5+Cgnqox7/ddYQfrt3g== 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=2xL2RAVEP5XW/LxYrRr+kHwaYvf60goYc3Dt2uOHhXI=; b=cxTZw5ax4stnhvqy3zbQfWSt4OGy8ipBoLCN6q0Mxqy2ob1ZqMj9qo71l58JDSooY4/FVdPhFgCsQdp94lDDZLXoUKafSBgji1BOBQ8XhllvwueZwkn2+aUALaW3Fxj68rz2Qo5++xuqSBbjMdDL7XiUUL/nlCWMWKCTRnngFPs= 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 DM6PR12MB3372.namprd12.prod.outlook.com (2603:10b6:5:11b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.24; Wed, 22 Jul 2020 04:06:09 +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.3216.021; Wed, 22 Jul 2020 04:06:09 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Subject: [PATCH v11 41/46] UefiCpuPkg/MpInitLib: Add CPU MP data flag to indicate if SEV-ES is enabled Date: Tue, 21 Jul 2020 23:05:45 -0500 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: SN4PR0201CA0071.namprd02.prod.outlook.com (2603:10b6:803:20::33) 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 SN4PR0201CA0071.namprd02.prod.outlook.com (2603:10b6:803:20::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.19 via Frontend Transport; Wed, 22 Jul 2020 04:06:08 +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: f173a82b-9c80-49af-7d06-08d82df49018 X-MS-TrafficTypeDiagnostic: DM6PR12MB3372: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pXkLsnarBA+mD30kPaUfwsAbnxMA0t2iZh/9BV7kV5dgrwra8vhEYHGLuKHrAIrS2eIY1NZgN/yQ8wYIG9NKVjtiA8gy7Voxz9o4l9NsVJm99ao66OG61c5rB7xLWnyS98ko4AYOabEYHNJetWHh6U3sYKO+WmppgkZYva9iJinTacPALc4GsN5vSKrH3w+KnkKydwUcToACD5IADLxEImnmuBrm3SKy5ul0+P11RkPO9n4rciPDwLHthYSM2Ji6f8n0Cxiv3pqpqJ3/f32Oa2K/VEzzKXzgBPyuxIMLza8aAphF35GWi+3fGvKBOhC1K2xEQyA9rEPnhTfNaCz5lvSk4KTOF5SQFPV8FElw0xjEShV9kKEaoppIhkF5Q89q57vng3tJnWq+9CBj4d2h42xgUcxo0DdnjJftqBKFd/Z/q098S68v55QssXc4foEHG3H9BcOzvBqHKd6LAf5q7A== 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:(6029001)(4636009)(366004)(26005)(956004)(5660300002)(2906002)(83380400001)(966005)(36756003)(6486002)(2616005)(86362001)(6916009)(6666004)(8676002)(52116002)(186003)(16526019)(66946007)(8936002)(66556008)(498600001)(66476007)(7696005)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: RqzC5BjyMN/h6iqun9RQSgwe8soIX2CHxHsuWR2S36ZGQUkOOTSXvqgKdvvZlbmiqU3cSRk5KPf1kPn7DMKhwYdAuQ3zPdMc1YiU+RstQLr9RUXz45S6gD+iOtKJTKkFGtK08Zr8i1CThovxRvlZ8iv0M4rpvRB2E7ZrmY1MJpBeFvNhfwcXpWYKt1dM7VbR27m3C5LhYWajKY+AMwdBN3DnACDHGqbDFAtlbE5iGMvpeSQ7zjYV+/qvtrf2Lxti2uCoYSNv9ZB2YoRe4TKJM6VY10Dm3OcvFTRx/zB7U2ogL8EqPygRNB98SJoB1uWVCbcbnsZfG/Zl7ifgpGR++H0vgIHycuiCeZxz7SFQgPaNBxenP8JWy49BHVMx9FS5iNwUvsoueFXhJ3J91vUz7tIOV2SD2XbwhKtxciAKYOKAYJ83ydYR2jeGNpFudGMTNPtZCBug4lqIu6nA3BUwRSGms5+jrlFzAgWu1STHDk0= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: f173a82b-9c80-49af-7d06-08d82df49018 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2020 04:06:08.8937 (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: Dl7eJmUsj36pmxJoltx6dvREjtIm0Gwig4DrW/1m7gbmMQLCe3z2IasYinfJdWLGNaTvk8GMDLmXrcRjF3U1sA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3372 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 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 Reviewed-by: Eric Dong 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/Lib= rary/MpInitLib/DxeMpInitLib.inf index 9907f4157b09..583276595619 100644 --- a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf +++ b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf @@ -71,4 +71,5 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode ## = CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate ## = SOMETIMES_CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApStatusCheckIntervalInMicroSeconds ## = CONSUMES + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled ## = CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard ## = CONSUMES diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf b/UefiCpuPkg/Lib= rary/MpInitLib/PeiMpInitLib.inf index 89ee9a79d8c5..4b3d39fbf36c 100644 --- a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf +++ b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf @@ -61,6 +61,7 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize ## CONS= UMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode ## CONS= UMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate ## SOME= TIMES_CONSUMES + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled ## CONS= UMES =20 [Ppis] gEdkiiPeiShadowMicrocodePpiGuid ## SOMETIMES_CONSUMES diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpIn= itLib/MpLib.h index a8ca03efb8e3..5b46c295b6b2 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -276,6 +276,8 @@ struct _CPU_MP_DATA { // driver. // BOOLEAN WakeUpByInitSipiSipi; + + BOOLEAN SevEsIsEnabled; }; =20 extern EFI_GUID mCpuInitMpLibHobGuid; diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpIn= itLib/MpLib.c index 9b0660a5d4ea..2a3fbeef35f7 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -1704,6 +1704,7 @@ MpInitLibInitialize ( CpuMpData->CpuData =3D (CPU_AP_DATA *) (CpuMpData + 1); CpuMpData->CpuInfoInHob =3D (UINT64) (UINTN) (CpuMpData->CpuData + M= axLogicalProcessorNumber); InitializeSpinLock(&CpuMpData->MpLock); + CpuMpData->SevEsIsEnabled =3D PcdGetBool (PcdSevEsIsEnabled); =20 // // Make sure no memory usage outside of the allocated buffer. --=20 2.27.0