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.58]) by mx.groups.io with SMTP id smtpd.web12.4249.1596141733952250183 for ; Thu, 30 Jul 2020 13:42:14 -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=jaP7rB+m; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.220.58, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WFk9SEwRfaDSk5JER4t3u/icFBG5UHH5hLFRne2nvF9mPhcoMuqFGJL/3C5FjhzC9VxLNePdr5eAQKPA+JdwEgnGMKcnDizlu/GAZQ1y4LORab18VZTsiP3vED28A8se8KdAC2SgmhQvds0yoWQgMgKnVnOxD1q1JlnbgKAJcUKea6CKVS2aomsv33C8CcHDB7ffDaPQBKNNvAPDH5E6/9WX/DUiBch6gHxmJ1DUSVFaQtvGrMgILoin5FGaJQo7M8V0eXb4V1UQulL5BDb5JggL5o+7PyUtdLs3Npa8xZSpldl6MkaxO7irLxba65AhnBsPlijB7aQ8+trRMeD1ig== 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=aW+npegOUm5Xk+GHJrxmLiVYcMLloUbZNY91lF9UPbDdqtkkfbA0sZyyeH3/6kOCQdqAp7vdBpQ6Qw07btQe/05YGRwaBHdDukqjfiMpMXWUBUyCsyfzl7KEGpxsfZ71bRETBbnDP3P5i9cHucc9bfkrOQ4LmNH5P4b6EWgTJ1AKUJGIRhpllOjDzV8Eg/oAToRcxgq68McHqVi+bdXFsvK4vS9Xc3bQscOamFjk218EW4qEGxaL0x6H3D+6gMvLjejgQ07l40zGdAKZWfgNdUC9qIubLjnl2YY/a0FMiKPlIgvDGDkwVE8+jxSm2BVzrjDcB44k6jE4Ocmy42NwTA== 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=jaP7rB+mEV2d6FzJ6qOlq12yFjgasKbHPPsMMg6dgYSUlSbYJirMnLNokITZojcUFvucCdI4/fzM+Vq7sucO8DymNqvhmc1F5Swu6No6pHf3ibo8NHy7aAUM75VrB3GBpiHxu5aNbW1uwJvFXgCEbp9yfW3/xx4XTLqFMziqPNI= 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 DM6PR12MB3868.namprd12.prod.outlook.com (2603:10b6:5:1c8::21) 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 20:42:13 +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 20:42:13 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Subject: [PATCH v13 41/46] UefiCpuPkg/MpInitLib: Add CPU MP data flag to indicate if SEV-ES is enabled Date: Thu, 30 Jul 2020 15:41:50 -0500 Message-ID: <1b3d23968783b26244e66f216eea8cce6b9e5582.1596134638.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR21CA0050.namprd21.prod.outlook.com (2603:10b6:3:129::12) 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 DM5PR21CA0050.namprd21.prod.outlook.com (2603:10b6:3:129::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.1 via Frontend Transport; Thu, 30 Jul 2020 20:42:12 +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: fb7d7fc4-6147-4af0-9b73-08d834c909a5 X-MS-TrafficTypeDiagnostic: DM6PR12MB3868: 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: nX7OtXnKlUCAC5qmFJVFLP86wHfy9jVTT9r6WepSRtelzmu6ls7FEHLzwipbgL55E9hVhNordaNHnwuBTelDxlQN16X2uO7vGcxYhpjNs9RmsSTW3LPtecMDah7qa035jUWAHIKlKQod/DBUpIQl1sd76pwfy/cS508VhutKoycm3SX4DzZ2U2OEUujg32aZKEv7l4tq2LU8kLaBtxdWkhPR55jrkQTp/ka5ylKRjcR8sFl/ILBYypK5X7WsgQ1192poRfjT+UVx+D7N32yNfPDDoCrEwqIRR23kd0taUCAJe+TjMEuIjL4V2iOCFUxnAJGom8macboGX6SpVe7pzbXxH3Jqcq1WWZyhBYd1Z1lRKYSq1omjojGmQtcbVh+Q8zJgTWhs0houoqu6TdF4l8VVbJWPcTr9eJ8ac/W4p0bwjFBD6Dk5VOt5hKSFWeex2vLfL/K1SbFL2EEpNO+90Q== 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)(376002)(396003)(346002)(39860400002)(136003)(366004)(2906002)(5660300002)(52116002)(7696005)(2616005)(956004)(478600001)(66476007)(66556008)(316002)(16526019)(83380400001)(6666004)(6486002)(36756003)(8936002)(86362001)(66946007)(6916009)(26005)(966005)(186003)(8676002)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: stOtCn+gdt8rfe6pPkdqikuOHfv/hcQc5alzsBHZTSywRVm7S0tUnUW2kJ/gPRQ3LdlO5bCkXRezHSx2qYqnBpYgciEYTiACbJqWEWnOiwzXlaOD4Aaf+f2GTUFiTy9HV7ctjD2HDu0DNWM8OuLVmEr3OawisSpLIRz0jhsOmNPHSbp9jkZEZb5DZiWXvt+NyldkabtgdTWKVxT9qImTMEGfoUN6HmDCE6bBpRlJ+USxIOpbIVClvBX+xAwHmBQuHW8ti36KVhspYZjN2kbuWLwABG+LV5xfDEUHI9ebDslAUUCqNdA1/PRvuenuzCE73pKU26lUFRFXVbZaD+KssKxQOY+EazTgq52rd27HbM3xR9LECHHCaygZCQ3FocVKHPJMzZSJWpafBNwB86fCSI2VOZUUZMG+yif7LbltuxZiKNtYIEKE8si2J5pnELYRLbktzg9fbxVYMrx/V9pV6EfeUMc67bEmZ80wTXH3KZyKRHCHDDQYnOOcfCfajLgWgl+s7yVxJ6hreEiYd+Ki2dgNkXen5282GgIV3ptYGf+5LyjmwCnAyTARv6ezwCrQKEV5WkbvrTvaB+jyoSjJjTsy2+snSS9RM1W+ash03kHNMGtnHFJOd/SzSOLZjEXlRRWmx3M9Pf/KBZMaw60bkg== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb7d7fc4-6147-4af0-9b73-08d834c909a5 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2020 20:42:12.9793 (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: lmxbV0SV3vGkiPDcet/A/5ShWwetI1MGC7WhYtrGHv04tts/FWeMCvbbKTrVxBwYO5Kih153M06inJJ9+cMc+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3868 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