From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (NAM11-BN8-obe.outbound.protection.outlook.com [40.107.236.47]) by mx.groups.io with SMTP id smtpd.web12.62773.1595875430051492921 for ; Mon, 27 Jul 2020 11:43:50 -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=V6u1gPUF; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.236.47, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FUcTwTJqYdYY8ebnURZNaxmHPrwnOr3h/GqpvVEuN+gaSKjib94PfESsZUed/vxGD6OkpcD2VXwjgDK7S6LgN5kkdE0vhV75oTuL96UAPdMmSHpbi5ocBPdjVEIMbEy/l9A5qlOidZWiG8ZssJZDJuzorrloFFLciPZkEVYjr6k5TwkYPAqO1d2hqziv4nj6GFknQWvr3FwAsx0jIJpCfi6WjbnIUb7FbFMUAS7m1FkDpzdDPjQNbPIVa8COh3o64R8WksYS6XcROpT+wWHZ3n5xDZcMOyftA5U7mET96bONYBfO7249WKx9I10riYv8XqrmcEwn6DXDLbIDCkd5cA== 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=LjS9T9Dbo1pio/1wY2bW3Qwv+fyEgI7RYrTZZrVlDe7diWfVe2WP1z0WVtq32QMmUS1EOawb1g9XUIitbjSOnKFL/jNP1X+v3RxPz1fFVon0N7dIncK++Uup4DJAI4rvq2M0eB+bAicTSUeUZvuH5qrCb3OzcQhv9N8FUdVmFLHo7uwzUVvNf3x4TAWuJV+rp4wLDsY/17OUSe+mhQCds8eli8qQ9merKcTyV1BVAhT5Y4eBQ0vm4X27rqENYEebl01PuLR9oGOD8PChTf3E/hUJ3N9OhhikBxvN96QdlReHQWOPmAI+9eBzauoklnomuZQAtTKGjpO4UKGKc5lLEQ== 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=V6u1gPUFBb8W0eSqeHubzjMg7Ta7D0Y2yAGMnN6z6RBzKWzYjiTF25jfyRvgiB5XvaifzcMMY0FI98Il3GBZ6lTjHyfaJPZGpSCWWCED0BsGtGUkxwhD623yHHTPObq46ptb0sDS/W0P1wl2KKs+UCI1TVHE5mTqZdseV6ICB5E= 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 DM5PR12MB1257.namprd12.prod.outlook.com (2603:10b6:3:74::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.24; Mon, 27 Jul 2020 18:43:48 +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.031; Mon, 27 Jul 2020 18:43:48 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Subject: [PATCH v12 41/46] UefiCpuPkg/MpInitLib: Add CPU MP data flag to indicate if SEV-ES is enabled Date: Mon, 27 Jul 2020 13:43:26 -0500 Message-ID: <02616d06071387533c092505be7e2bd54cde9596.1595863587.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-ClientProxiedBy: DM5PR20CA0031.namprd20.prod.outlook.com (2603:10b6:3:13d::17) 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 DM5PR20CA0031.namprd20.prod.outlook.com (2603:10b6:3:13d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.23 via Frontend Transport; Mon, 27 Jul 2020 18:43:48 +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: 71817a88-2313-4d0e-a907-08d8325cffcc X-MS-TrafficTypeDiagnostic: DM5PR12MB1257: 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: Z5RJD4JLZLuvlpZzhE/jwhK/GU1QEtCxFhuUY0Iuvd0cOprySvcdu9rNDVnW7ZR/xHjvQOryaTcPjfUKUUtsm3wTOmLvOHaxLoXg85sdXGuETrSSac0VL2G9/nG5YLNVk/Y+taCCBAHT3ClDEY+36y0/Q+OSNqWkYkIa89JLXoDnfIaphj7fT9ahbVHHJR6mc4T8NsnKDfiRM6UDiIQxWXBngdVDMIhrwsuL6wbOK95W22p5I9Nw7bAHoRkjzhms3HybBLsTVXM0p+3epFrRZr+qJZcmcMGwj8BbcZstlQVErxPGMX6LVAjmhmlVBM0DywHfCtfPGnm8CN6PvT/wtAQ9ucgmWqtbsfucXjrPvOMZLzTbIz62Nq/W3WIB5SpbdelMCpk9qv0+rY68a2rMo9nsuJkIB44EabVh/PBsud6Dkukxp0X6ekM34lTJCs/IpWxl2V8JxrQdylYQnvqTRA== 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)(136003)(346002)(396003)(376002)(39860400002)(5660300002)(66476007)(66556008)(36756003)(8936002)(66946007)(6666004)(478600001)(186003)(16526019)(83380400001)(2906002)(26005)(52116002)(7696005)(2616005)(956004)(6486002)(86362001)(6916009)(8676002)(966005)(316002)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Vlk+0wChLJeG/KNFOpQFsy7wpOEco6RAIV/oFJpUaXTHHm7zrZ8CTiRVzUEtFfQJIBNB6yvJiFelf8lHtmSHEcrnctGaFK0jgmXkPa77GexLwVHHlD5l5FeyDneFPKy9+K4bVJWPcHxT6QeEPi2msHysOt4xW2tFR5fgBFzleaN0Blwd+xwIBAZb3yB2nmet0CABmYBpC89MQLq39U4xZVbdzj/jd49zSFn/MuiXx1ZZEsZrPz8O+fVKsBoz2AaFNXnRLzxgYPd0flzpvqATJdC+hzjwcaijzHQEHuuk1gX4QDLdaq/bIpQYacwW1TxBdACeYtHmzRzkklr0Sh8BC+Z+IREQVXmZdTCEY+L2qxD5Bw5dBMAjop4JTGuDNcvJ/DmxE4ScRs8vMa00+03bH7pEyy0JJP6TxV7qtwXHWkFphUvpIQytR1UTkZwWTQJcVPBBLQ8n1XFNLNn7xClHORtbthrNF57bF7Mcs3Wk36A= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71817a88-2313-4d0e-a907-08d8325cffcc X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2020 18:43:48.4807 (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: sT2B10t5VKu8pavp956v98Wi/cqH05S+05Y7e4ks+h/sDUhSQ/GjLPLIcqep3yGbxaU3TgAjpsBs1BP1488q3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1257 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