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 []) by mx.groups.io with SMTP id smtpd.web12.670.1583190509745452410 for ; Mon, 02 Mar 2020 15:08:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=hSp8fa7P; 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=AIm8Ipaboj9n44UNxhHd8UMEH7m8dueVz0kgT81uIMKTLgbqmDPPaVqLJjU6jihOmLNyeYz1raHFCs4BvZS3K3yTVmFD+M2zomF8vCexqdWnKGgPta8zDUjyrHvgKNK3jST9LSF5QqlRSrDgSz2nwS4dkB8tjTdjHk3kyyBCl30G/6uF/XmxUvSzxRbfcF+qyJvLQmK5IXcTHmkkzfgtRp05A0/EKMgyf2sjA4yZEhIxO4qnHa8wPtlVEXw6NgQwvL9nnAsols+9XMSMbE9lm+LEDAz7m46u+mHy5kuCapHiLWtelStth4wK7I1B0BPgZlYgCz2JOt1N4wK8kt3YBw== 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=0hqs7g4JA8bRNE1UNv77i/GWxITqC2XLHCj8EoCKnFk=; b=B/DJWVDnu5LRcxn3by7aNJ2KBPLexplTb7m/JB0u4nswzpo7819MkGsYZpUT1R4y4nqC3zA8I7NMBkl5y4pocXtFt2g1RaOmvMbEx9JB0s1nQurNj/rs8YJ7cGo8bCKw11bbYahvZrS7iAkyhQqYbcLQIBz2Bjli+e5ACsziWZLkZUKj0boZ6U1ujp8+rDQwSl9YIliZqb7It+k4QHIZbsXP2bXYG4k+vS8rftbe65ke/krSCGhJ6kQY84E8bGBafa3D8lExkg0Y+TUgEy9dTrJuEiuC9k/KUzZa2d+WulWLzlxcToufyfiTBW3d+ATC1+lf3QFwxfqKuSWVhtQ5HA== 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=0hqs7g4JA8bRNE1UNv77i/GWxITqC2XLHCj8EoCKnFk=; b=hSp8fa7PBLWLBeiiynRkhNjNRKQQSzulKTc4aXpSOwcQ2o2G0G1CPH72qWIdJwJ1dLppIVktBGxISWBgLGIhGvRsDhnDhHNaxFUxypNJZ1+4uGfMXj7mc8OmCubJ9Yp0RgBh3w2dsrnEJKdAeLjZM6RhVcYTGJZOrUzx4Oh7PkE= 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:08:29 +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:08:29 +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 38/42] UefiCpuPkg/MpInitLib: Add CPU MP data flag to indicate if SEV-ES is enabled Date: Mon, 2 Mar 2020 17:07:09 -0600 Message-Id: <75150c4f1149d37216677856dd5cb4624243d256.1583190432.git.thomas.lendacky@amd.com> 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:08:02 +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: 7041acde-ad0f-4064-e078-08d7befe8f68 X-MS-TrafficTypeDiagnostic: DM6PR12MB4201:|DM6PR12MB4201: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 033054F29A X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6029001)(4636009)(376002)(366004)(136003)(346002)(396003)(39860400002)(199004)(189003)(66946007)(8936002)(54906003)(316002)(81156014)(81166006)(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: UAH1pYKSrsWXo3bkm9WfZXeizwGL4/PXdYNbOWwzNuOjN0+1wyecxZM8Mh5lvOzdY8bkHgDEa8l3IHPKgbIujKewxqFtTXEIpaI/GPHDeN5wXCyPRSmNI5o0m3GkMzIj3213vVvPSA66sWTH5MiAswgFF/TDoXBJp8pBxnW2SomXLPGPECOqBcpsVMZXGHpS2fk7MOoQiiZgNcTo/ZTHm1lD3T5vxVxwnrZWB+x7aixx1TDYc3ZwItv8eQt+svNNwsbhJ9OtjJEYF7TR/dFqusrxrY6fIqwDeP5j4mBx+KEpvsNRkFkzcf5j2mnaGcsk8jmjrrXU+AEGkIpxduE3tmMGQTQ3+d6euNr68WL1P7d+mOR89G/MBBQOvRN9txND/h6wbIoHJqeDnyvrgx6qPh22oBVtuKM9WKUA/IE9vJZulLMIRyaWgKo5X68M7YRCx/kjDLjBKRR1+JmhPYi5g1uqL56cYvRpKPgFOtGjn3ZBxySOJKz7QGvlbNz610mC9eWT1RqCcxLYo52Gu4C+pQ== X-MS-Exchange-AntiSpam-MessageData: Tpo9+lAUk4TzfmJRrIprBUduvJk9HiDXAF0Zr1jUo0Dxi5JbqjZELYMLaIAzwVPEVsLmejo+N6TigKuyDn1IfFcu9SKINdI492d2XkZ20YIEU8M4TU7FrBPtJ3NjZDjbNNbY6rtRCcBCPiFfhB2DdQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7041acde-ad0f-4064-e078-08d7befe8f68 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2020 23:08:03.5488 (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: Wh+ps5yy6Oon/PFOYGhUnojU2TVycwY2UeN1qnChbD+szFaHqhGn8uJIj1gZb0EFSB61z6LfJe/NNNBwDY+f2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4201 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 45aaa179ff2e..8b0eb1df9594 100644 --- a/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf +++ b/UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf @@ -69,5 +69,6 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode ## CONSUMES gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate ## SOMETIMES_CONSUMES + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard ## CONSUMES diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf b/UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf index d78d328b4252..b4dc7e69d829 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 + gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled ## CONSUMES [Ppis] gEdkiiPeiShadowMicrocodePpiGuid ## SOMETIMES_CONSUMES diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h index 0c89f8a6e732..edd936f06396 100755 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h @@ -275,6 +275,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 64a4c3546e22..81c5b1a5b701 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c @@ -1714,6 +1714,7 @@ MpInitLibInitialize ( CpuMpData->CpuData = (CPU_AP_DATA *) (CpuMpData + 1); CpuMpData->CpuInfoInHob = (UINT64) (UINTN) (CpuMpData->CpuData + MaxLogicalProcessorNumber); InitializeSpinLock(&CpuMpData->MpLock); + CpuMpData->SevEsIsEnabled = PcdGetBool (PcdSevEsIsEnabled); // // Make sure no memory usage outside of the allocated buffer. -- 2.17.1