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.52]) by mx.groups.io with SMTP id smtpd.web12.28957.1652708481668979380 for ; Mon, 16 May 2022 06:41:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=Ok9zni+u; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.236.52, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YZjPQFl3SkuwkLCiGnvj96pLo6I07INyLHvLSfgbB+ibw86hb+mHyV9c8qYjFX+YRdd8HPE4Em/yZ82fuKaG7fjx2xhCEADKQcvHrlomrSA4Xvc+areDmB08HZ9fRLluYbqJp2rdws8mCnZguFNeraYkfLZcm6r8UUrchXRH1CxXsbTNT0OAIenSUhXN8fvjSw2wkBKjQKbywRoHyJPoFGIKOMplWNRYLeaCDiVKR1XO7mnDSZkWZVyJ9uR0zwG/yXBjOl04WJbGLZosI4An23GkXOnzxKqbCvbDX1RrdkwIX2XdPtYmIDmBflOrsevJimgtKSjtfBLh8+Wac3jW4w== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6m3n8r43/65X0wz3rinBYncZwC4E9Lfc49aWgCuxBFA=; b=bUA8y2tluvUaHMayWruWrzHnzAql26+XH4rl42molfwC8xjdW3PkWQ17G3uZ/dUOZpZkYCEwGlB4OTC/5O4qogWphxA7Muli6L8Pby8PBwGiV0VBm2C6MxHj3kU43vOPI0nu/NdPgbKiWkguxlxfLFc/3i7n1e6WW4VNXckuxifVZ2Wlta0PHmUCI1jxAEoj6AzX2B2CF2P3AdfuaMi5ndoCH2e9hptmtLiTrmCe89UhJ+BEFj8e/c9+ChXN0tr89a8pKx2dByxtPcLSUfVZ5AduXA4jrpUHCE85p3QbzPE54p/dKbQvgnqODEe5xB9cs/n5KkvhV3DOykQRETS1nA== 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=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6m3n8r43/65X0wz3rinBYncZwC4E9Lfc49aWgCuxBFA=; b=Ok9zni+u2p7wefKiFLPCn/M7F0WUmjVHLOs3nNZkE/DwQ9pd1gtV4aSm6C33FiPORHa2p3ePCLuMcI2+zZbe5CxXAZ80Z3JKFoJ2SjgvJ36dMAOxxzJa7wkbPHVnE4DUMXvz7ef61/nMDc5wsXG/6A2CnjPUZfjl3MhctWfE2T0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; Received: from DM4PR12MB5229.namprd12.prod.outlook.com (2603:10b6:5:398::12) by BN6PR12MB1377.namprd12.prod.outlook.com (2603:10b6:404:1c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.15; Mon, 16 May 2022 13:41:18 +0000 Received: from DM4PR12MB5229.namprd12.prod.outlook.com ([fe80::db8:5b23:acf0:6f9a]) by DM4PR12MB5229.namprd12.prod.outlook.com ([fe80::db8:5b23:acf0:6f9a%4]) with mapi id 15.20.5250.018; Mon, 16 May 2022 13:41:18 +0000 Message-ID: <58651b60-018c-1a52-495b-f6cf4283eeeb@amd.com> Date: Mon, 16 May 2022 08:41:15 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH v3 3/5] MpInitLib: Put SEV logic in separate file To: Ray Ni , devel@edk2.groups.io Cc: Eric Dong , Rahul Kumar , Michael Roth , James Bottomley , Min Xu , Jiewen Yao , Jordan Justen , Ard Biesheuvel , Erdem Aktas , Gerd Hoffmann References: <20220516071412.359-1-ray.ni@intel.com> <20220516071412.359-4-ray.ni@intel.com> From: "Lendacky, Thomas" In-Reply-To: <20220516071412.359-4-ray.ni@intel.com> X-ClientProxiedBy: SN6PR08CA0007.namprd08.prod.outlook.com (2603:10b6:805:66::20) To DM4PR12MB5229.namprd12.prod.outlook.com (2603:10b6:5:398::12) Return-Path: Thomas.Lendacky@amd.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e97afd86-f4da-4e56-95fe-08da3741c114 X-MS-TrafficTypeDiagnostic: BN6PR12MB1377:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: keBWeft3kP8DgeCk8OXf9ZBsDN1UnmOETcLxklte7CFtu3tIlVZNpn3yoGwDYI8FDiV+2ot6Y/Mj0gaHGegEUg2/aCpp3L1KphwLGkZRbCmV0Qm7tkOp/Y/KIw9pTH63I7HyU4ZJtrlJ+NocFrWGaP2jGf4jIH7p20z+fgLupPp8EMhh2442VJolMfoDSb5t5CL0GhTGJxbGWKp6KHMFMjeO/dK0+J2S8We7tTbwbnrwm4L7k2P5tGHADC8JXSR2/Ollwt2KC/SdKP3iP+JXozF6/kEUY1VzU35QBYTt22q6fFTjTVVFuAZ5l2QQsB/bjbxxjGK0uy5o0q7Dt5RDXnQPZQX3SEJ/U/6XSw1fsuNZcA40KkCnPCZ2TNBiAF6NOnwCYkbBmG31u3am7esYDv7lloCGARk0zdBbMF5keDDcT+GiJVr56yZfRhVs0xMamC4iPAQex48H1qAtcCGZWlm176eYhcRpFNMGxb6YrGkcXiZnnvEztQhWYoGFtoc0oO+xbsAJylgrPjgO9ox089yu1owuMn8dJoIzCTeEv9Vm+vZ/7ejRoOZSWjNsaFbIt3TNCyhTRP6SRhmjFQCnxNBP72hrRAn4mF/1rdnJERXqkG0IBInmPebZVUplzPwzCpnDUoPc0cB4yGiHeS7BHRWUXKMJBarJVvlSdGEPYYledHoVWNqosTjByfIJfVV7vjVYRyC5dPyjeIlvBZ7UnKe+1++LpXHfDjOJLcdE8b8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR12MB5229.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(6029001)(4636009)(366004)(8936002)(6512007)(26005)(2616005)(19627235002)(38100700002)(30864003)(508600001)(66476007)(66946007)(8676002)(66556008)(4326008)(6486002)(5660300002)(6506007)(31696002)(53546011)(83380400001)(316002)(2906002)(86362001)(54906003)(31686004)(36756003)(186003)(7416002)(6666004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SmNRWGExU3g4TXorMFpZc0Q0MFRFNHZTVWVZOFBqUkdtd2tHSlBXYlJ4cUls?= =?utf-8?B?cEhHSWdkeGdSQ0dQbW0zWUtpSzIrSm9mcXVlcDhoeHpFb0cxRG11NWxNMmJ5?= =?utf-8?B?V2JCRWs5UllLa3pQTGwwMS9yQVNlNWFmYzdKdWF3N2Q5eEYvNXo2NUJxVFUy?= =?utf-8?B?SVlzWjI2ekFmQ3ltTGloYkpyQkY1OFZOZW5WbGlUOCtNZGpibHk3MlBGSGJX?= =?utf-8?B?ZU9vL2pqelMrT0ErMitXMkVFbk1WdzdOUk5yRGlKSWNTdDg5dnRCMzVWWVJ1?= =?utf-8?B?VytUcXUwYzdQQTZ4U3p2MWZkaTRKMlBCUlJ3QkE3Nk9xalpSekpQUldIRHF2?= =?utf-8?B?VjJXRDJvcUYxWkphNVBuOU5vZzQ4cUtrSHRwVGFUdDFYaDJnUWhZQUNuNWFU?= =?utf-8?B?L1hPYUVQbFJtNGJtSld2VEpxUVUwQ0U0UzJUS3RxOStySmF4ejZmSTB4M1hW?= =?utf-8?B?VzRqUktNaFdldWVNUTZZNGV4alp2d1Uwd2cvOGJTcnpMbDdiMm5nNWhSbWNo?= =?utf-8?B?aTM0aFc0a01JV2FiYk95TGxHU3BhTkJXRldTZDdxRUwvblBlM1lodW9YTGJj?= =?utf-8?B?UDZSdFRYclVQSzFJaUpjYk9WTHpXQ2RLRzdycm5vTVp3RlQyOVQrN3o4Mjdh?= =?utf-8?B?WTJxcWVlQko5eTlsNHdqWHRXbVpXMFZYSEVTR2RFQzhkb29PeDJOMFlCR2ov?= =?utf-8?B?ZXZMc3VoSFNUVUxlRUJPNU1ZbWcrZHVXNDFlL0VGNWw5U3F0d1dJRnp5RUl5?= =?utf-8?B?czJqdEcxUFZoQ2tibEpteFVhNVY3WnJLbW9LSWN1dG1WQ2Y1ckJ0a1JYR0ds?= =?utf-8?B?L0IzWE9seHcxSEJxV2pXY3lLcFRTcEhtTFhTNndVNnd6SnFhbmNTYjZBM3c3?= =?utf-8?B?NzIxeEhxSUFtQitPVm9LTzdncGVrVDZCa3k3VUFvNDJHMUFkVUlSY2JxNDhJ?= =?utf-8?B?QWlJNVRRMit3anVNOTZabUMyWnNqaThGb0VscTNDZ2ZPQVhhbEhEcTVaOUJz?= =?utf-8?B?U2pIelJPd25EQlh4YTVQYm5aSUlsNGlTMGFVOXUxR1JMbTdSazJvL2lEakNx?= =?utf-8?B?OG5LM3gzL3JlK0xNV3h1b0NFeXhEbGpleGl0TjZJVVVROWRCTjlpTjVxY2JP?= =?utf-8?B?SFFvc01tSWtLaFBJbTdiSHl0NmtnemZSN3VUc0hMcTI1d2RwS04xZVBhYVl5?= =?utf-8?B?dWROejBxaDJqT1pXVGtYdEpFY3dPdkxjMFBXZzl4QjAzcTNaUGVKSlQxZE5t?= =?utf-8?B?UjRZMWx1dlAvTUJXczNRUFU5MEUzZjNoZXpCUnQrcGRqOHBlT0txN0JxVHk4?= =?utf-8?B?enRjWC9td2o5S1B4UkViMUpkc3A3aytvbk1NT3U1aU40U2dVOG9kNmtOQnRj?= =?utf-8?B?V3hQZXMzOW9wa3crTFpMWEFtQVFvYk1ZSHBiQnZoeTBSamhYdm5YQTQ2a1cw?= =?utf-8?B?RHpLQTNtYWp3b2pPTGFYdTVHRVlRTUw1MUdLaE5TZjBlbEdNOUlXelkxWVY4?= =?utf-8?B?enBwYW5LWm9pY2lLU3FDTWV6Ykk2YzgxTVJYSnJxbHRteWJPWGNzV3VPelBN?= =?utf-8?B?TkRsVnJkSFFOOW5PTzlLVjc0bHNZdEpjV0E5Ly9TTXlZT2JkUTJXQTZhN3Js?= =?utf-8?B?UDdPSzVNNVYyYmhlazVvb2doQk1oQU9VbysxSWR2ZGo1c2VGbEVTMWRqK2oz?= =?utf-8?B?YTE5Z0ZVQy9qYjdySGo2TTZiNUoyaWcxclljQ1IyTlJTYnF0V0dTQmYyblIx?= =?utf-8?B?ZFg3R3Z1WnlrbUowTkZ6TVZ3QldyWnY5UmducmRKdWl1NHUyL0lsM1E2Q2lW?= =?utf-8?B?U0dUSVkrU044VFpjU1Y0TnBWa1V6VjJiL2RaMk5pRkM4cUVmWEVKTGwzRExO?= =?utf-8?B?WWxibFlBSmQydWV0WWp4WFhJMFVIS0hxTmN3R05WS1VnVHhPUElrd0p0cmcr?= =?utf-8?B?eTFSQzBzb04xL0lGVHJrTEwwNVZaZXdHdi9VcFFwNlBqRGI3V2lKbXg3bGZE?= =?utf-8?B?dEhOMit3SlJ6OUtpSURUbmpjT3U5MVBLMStuQWg0a29jRGE0TVVxUGJpUE5C?= =?utf-8?B?OFhPWEhjdFVYT29RMlg3Mlg1ZnZLWnZPKzlyU1BONkJ4c3UrcFdmRmJYNWxK?= =?utf-8?B?azRKSmpDZjAvRDJyMitZMzM5Y0xlenRwMVMzZGFkcWRvcUhYRUZ3ZjV6a2hL?= =?utf-8?B?a2pFRkZ4eUxSSWsxYlR4UGVMMWJwOUo5ckFFZjBHcGcrSTVYOE1Wc3plUkE1?= =?utf-8?B?MmZodmlsb2FuRjlNQ0MrSWxMR2RWUHdEdHAvY1BCbk1hZmE4djVSQVBpaGVS?= =?utf-8?B?Vk5xSzdUdk5GcVA2eS9aVm80aFV0UlFGTFl4ZGdKMDdSZkVQUGxvUT09?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: e97afd86-f4da-4e56-95fe-08da3741c114 X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5229.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 13:41:18.7473 (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: ID1oBnmanf1AfDwmfUD8AkjcVLNxrTSuLbR+ew5ZwOcIoyNHtkCF9pk9iyWjW0dw60e4tUq30BqYZtqmdsKpLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1377 Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/16/22 02:14, Ray Ni wrote: > The patch does several simplifications: > 1. Treat SwitchToRealProc as part of RendezvousFunnelProc. > So the common logic in MpLib.c doesn't need to be aware of > SwitchToRealProc. > As a result, SwitchToRealSize/Offset are removed from > MP_ASSEMBLY_ADDRESS_MAP. > > 2. Move SwitchToRealProc to AmdSev.nasm. > All other assembly code in AmdSev.nasm is called through > OneTimeCall. I hadn't realized that Brijesh made all of the functions in AmdSev.nasm OneTimeCall functions, so moving the include now actually gets those "functions" out of the RendezvousFunnelProc function. Looks much cleaner this way. Thanks Ray! Reviewed-by: Tom Lendacky Tested-by: Tom Lendacky > > Signed-off-by: Ray Ni > Cc: Eric Dong > Cc: Ray Ni > Cc: Rahul Kumar > Cc: Michael Roth > Cc: James Bottomley > Cc: Min Xu > Cc: Jiewen Yao > Cc: Tom Lendacky > Cc: Jordan Justen > Cc: Ard Biesheuvel > Cc: Erdem Aktas > Cc: Gerd Hoffmann > --- > .../Library/MpInitLib/Ia32/MpFuncs.nasm | 5 +- > UefiCpuPkg/Library/MpInitLib/MpEqu.inc | 4 +- > UefiCpuPkg/Library/MpInitLib/MpLib.c | 13 +- > UefiCpuPkg/Library/MpInitLib/MpLib.h | 4 +- > UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm | 148 ++++++++++++++++ > UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm | 159 +----------------- > 6 files changed, 161 insertions(+), 172 deletions(-) > > diff --git a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm > index 8981c32722..28301bb8f0 100644 > --- a/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm > +++ b/UefiCpuPkg/Library/MpInitLib/Ia32/MpFuncs.nasm > @@ -199,7 +199,6 @@ CProcedureInvoke: > call eax ; Invoke C function > > jmp $ ; Never reach here > -RendezvousFunnelProcEnd: > > ;------------------------------------------------------------------------------------- > ;SwitchToRealProc procedure follows. > @@ -209,6 +208,8 @@ SwitchToRealProcStart: > jmp $ ; Never reach here > SwitchToRealProcEnd: > > +RendezvousFunnelProcEnd: > + > ;------------------------------------------------------------------------------------- > ; AsmRelocateApLoop (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfApStack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer); > ; > @@ -258,8 +259,6 @@ ASM_PFX(AsmGetAddressMap): > mov dword [ebx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddress], AsmRelocateApLoopStart > mov dword [ebx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSize], AsmRelocateApLoopEnd - AsmRelocateApLoopStart > mov dword [ebx + MP_ASSEMBLY_ADDRESS_MAP.ModeTransitionOffset], Flat32Start - RendezvousFunnelProcStart > - mov dword [ebx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealSize], SwitchToRealProcEnd - SwitchToRealProcStart > - mov dword [ebx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealOffset], SwitchToRealProcStart - RendezvousFunnelProcStart > mov dword [ebx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealNoNxOffset], SwitchToRealProcStart - Flat32Start > mov dword [ebx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealPM16ModeOffset], 0 > mov dword [ebx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealPM16ModeSize], 0 > diff --git a/UefiCpuPkg/Library/MpInitLib/MpEqu.inc b/UefiCpuPkg/Library/MpInitLib/MpEqu.inc > index aba53f5720..1cc071cf7b 100644 > --- a/UefiCpuPkg/Library/MpInitLib/MpEqu.inc > +++ b/UefiCpuPkg/Library/MpInitLib/MpEqu.inc > @@ -1,5 +1,5 @@ > ;------------------------------------------------------------------------------ ; > -; Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved.
> +; Copyright (c) 2015 - 2022, Intel Corporation. All rights reserved.
> ; SPDX-License-Identifier: BSD-2-Clause-Patent > ; > ; Module Name: > @@ -27,8 +27,6 @@ struc MP_ASSEMBLY_ADDRESS_MAP > .RelocateApLoopFuncAddress CTYPE_UINTN 1 > .RelocateApLoopFuncSize CTYPE_UINTN 1 > .ModeTransitionOffset CTYPE_UINTN 1 > - .SwitchToRealSize CTYPE_UINTN 1 > - .SwitchToRealOffset CTYPE_UINTN 1 > .SwitchToRealNoNxOffset CTYPE_UINTN 1 > .SwitchToRealPM16ModeOffset CTYPE_UINTN 1 > .SwitchToRealPM16ModeSize CTYPE_UINTN 1 > diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c > index d761bdc487..aa0eb9a70b 100644 > --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c > +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c > @@ -936,8 +936,7 @@ FillExchangeInfoData ( > // EfiBootServicesCode to avoid page fault if NX memory protection is enabled. > // > if (CpuMpData->WakeupBufferHigh != 0) { > - Size = CpuMpData->AddressMap.RendezvousFunnelSize + > - CpuMpData->AddressMap.SwitchToRealSize - > + Size = CpuMpData->AddressMap.RendezvousFunnelSize - > CpuMpData->AddressMap.ModeTransitionOffset; > CopyMem ( > (VOID *)CpuMpData->WakeupBufferHigh, > @@ -991,8 +990,7 @@ BackupAndPrepareWakeupBuffer ( > CopyMem ( > (VOID *)CpuMpData->WakeupBuffer, > (VOID *)CpuMpData->AddressMap.RendezvousFunnelAddress, > - CpuMpData->AddressMap.RendezvousFunnelSize + > - CpuMpData->AddressMap.SwitchToRealSize > + CpuMpData->AddressMap.RendezvousFunnelSize > ); > } > > @@ -1029,7 +1027,6 @@ GetApResetVectorSize ( > UINTN Size; > > Size = AddressMap->RendezvousFunnelSize + > - AddressMap->SwitchToRealSize + > sizeof (MP_CPU_EXCHANGE_INFO); > > return Size; > @@ -1054,11 +1051,9 @@ AllocateResetVector ( > CpuMpData->WakeupBuffer = GetWakeupBuffer (ApResetVectorSize); > CpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *)(UINTN) > (CpuMpData->WakeupBuffer + > - CpuMpData->AddressMap.RendezvousFunnelSize + > - CpuMpData->AddressMap.SwitchToRealSize); > + CpuMpData->AddressMap.RendezvousFunnelSize); > CpuMpData->WakeupBufferHigh = AllocateCodeBuffer ( > - CpuMpData->AddressMap.RendezvousFunnelSize + > - CpuMpData->AddressMap.SwitchToRealSize - > + CpuMpData->AddressMap.RendezvousFunnelSize - > CpuMpData->AddressMap.ModeTransitionOffset > ); > // > diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.h b/UefiCpuPkg/Library/MpInitLib/MpLib.h > index 59ab960897..974fb76019 100644 > --- a/UefiCpuPkg/Library/MpInitLib/MpLib.h > +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.h > @@ -1,7 +1,7 @@ > /** @file > Common header file for MP Initialize Library. > > - Copyright (c) 2016 - 2021, Intel Corporation. All rights reserved.
> + Copyright (c) 2016 - 2022, Intel Corporation. All rights reserved.
> Copyright (c) 2020, AMD Inc. All rights reserved.
> > SPDX-License-Identifier: BSD-2-Clause-Patent > @@ -181,8 +181,6 @@ typedef struct { > UINT8 *RelocateApLoopFuncAddress; > UINTN RelocateApLoopFuncSize; > UINTN ModeTransitionOffset; > - UINTN SwitchToRealSize; > - UINTN SwitchToRealOffset; > UINTN SwitchToRealNoNxOffset; > UINTN SwitchToRealPM16ModeOffset; > UINTN SwitchToRealPM16ModeSize; > diff --git a/UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm b/UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm > index 8bb1161fa0..7c2469f9c5 100644 > --- a/UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm > +++ b/UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm > @@ -198,3 +198,151 @@ RestoreGhcb: > > SevEsGetApicIdExit: > OneTimeCallRet SevEsGetApicId > + > + > +;------------------------------------------------------------------------------------- > +;SwitchToRealProc procedure follows. > +;ALSO THIS PROCEDURE IS EXECUTED BY APs TRANSITIONING TO 16 BIT MODE. HENCE THIS PROC > +;IS IN MACHINE CODE. > +; SwitchToRealProc (UINTN BufferStart, UINT16 Code16, UINT16 Code32, UINTN StackStart) > +; rcx - Buffer Start > +; rdx - Code16 Selector Offset > +; r8 - Code32 Selector Offset > +; r9 - Stack Start > +;------------------------------------------------------------------------------------- > +SwitchToRealProcStart: > +BITS 64 > + cli > + > + ; > + ; Get RDX reset value before changing stacks since the > + ; new stack won't be able to accomodate a #VC exception. > + ; > + push rax > + push rbx > + push rcx > + push rdx > + > + mov rax, 1 > + cpuid > + mov rsi, rax ; Save off the reset value for RDX > + > + pop rdx > + pop rcx > + pop rbx > + pop rax > + > + ; > + ; Establish stack below 1MB > + ; > + mov rsp, r9 > + > + ; > + ; Push ultimate Reset Vector onto the stack > + ; > + mov rax, rcx > + shr rax, 4 > + push word 0x0002 ; RFLAGS > + push ax ; CS > + push word 0x0000 ; RIP > + push word 0x0000 ; For alignment, will be discarded > + > + ; > + ; Get address of "16-bit operand size" label > + ; > + lea rbx, [PM16Mode] > + > + ; > + ; Push addresses used to change to compatibility mode > + ; > + lea rax, [CompatMode] > + push r8 > + push rax > + > + ; > + ; Clear R8 - R15, for reset, before going into 32-bit mode > + ; > + xor r8, r8 > + xor r9, r9 > + xor r10, r10 > + xor r11, r11 > + xor r12, r12 > + xor r13, r13 > + xor r14, r14 > + xor r15, r15 > + > + ; > + ; Far return into 32-bit mode > + ; > + retfq > + > +BITS 32 > +CompatMode: > + ; > + ; Set up stack to prepare for exiting protected mode > + ; > + push edx ; Code16 CS > + push ebx ; PM16Mode label address > + > + ; > + ; Disable paging > + ; > + mov eax, cr0 ; Read CR0 > + btr eax, 31 ; Set PG=0 > + mov cr0, eax ; Write CR0 > + > + ; > + ; Disable long mode > + ; > + mov ecx, 0c0000080h ; EFER MSR number > + rdmsr ; Read EFER > + btr eax, 8 ; Set LME=0 > + wrmsr ; Write EFER > + > + ; > + ; Disable PAE > + ; > + mov eax, cr4 ; Read CR4 > + btr eax, 5 ; Set PAE=0 > + mov cr4, eax ; Write CR4 > + > + mov edx, esi ; Restore RDX reset value > + > + ; > + ; Switch to 16-bit operand size > + ; > + retf > + > +BITS 16 > + ; > + ; At entry to this label > + ; - RDX will have its reset value > + ; - On the top of the stack > + ; - Alignment data (two bytes) to be discarded > + ; - IP for Real Mode (two bytes) > + ; - CS for Real Mode (two bytes) > + ; > + ; This label is also used with AsmRelocateApLoop. During MP finalization, > + ; the code from PM16Mode to SwitchToRealProcEnd is copied to the start of > + ; the WakeupBuffer, allowing a parked AP to be booted by an OS. > + ; > +PM16Mode: > + mov eax, cr0 ; Read CR0 > + btr eax, 0 ; Set PE=0 > + mov cr0, eax ; Write CR0 > + > + pop ax ; Discard alignment data > + > + ; > + ; Clear registers (except RDX and RSP) before going into 16-bit mode > + ; > + xor eax, eax > + xor ebx, ebx > + xor ecx, ecx > + xor esi, esi > + xor edi, edi > + xor ebp, ebp > + > + iret > + > +SwitchToRealProcEnd: > diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm > index d7e0e1fabd..1daaa72b1e 100644 > --- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm > +++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm > @@ -152,11 +152,6 @@ SkipEnable5LevelPaging: > > BITS 64 > > -; > -; Required for the AMD SEV helper functions > -; > -%include "AmdSev.nasm" > - > LongModeStart: > mov esi, ebx > lea edi, [esi + MP_CPU_EXCHANGE_INFO_FIELD (InitFlag)] > @@ -265,154 +260,12 @@ CProcedureInvoke: > add rsp, 20h > jmp $ ; Should never reach here > > -RendezvousFunnelProcEnd: > - > -;------------------------------------------------------------------------------------- > -;SwitchToRealProc procedure follows. > -;ALSO THIS PROCEDURE IS EXECUTED BY APs TRANSITIONING TO 16 BIT MODE. HENCE THIS PROC > -;IS IN MACHINE CODE. > -; SwitchToRealProc (UINTN BufferStart, UINT16 Code16, UINT16 Code32, UINTN StackStart) > -; rcx - Buffer Start > -; rdx - Code16 Selector Offset > -; r8 - Code32 Selector Offset > -; r9 - Stack Start > -;------------------------------------------------------------------------------------- > -SwitchToRealProcStart: > -BITS 64 > - cli > - > - ; > - ; Get RDX reset value before changing stacks since the > - ; new stack won't be able to accomodate a #VC exception. > - ; > - push rax > - push rbx > - push rcx > - push rdx > - > - mov rax, 1 > - cpuid > - mov rsi, rax ; Save off the reset value for RDX > - > - pop rdx > - pop rcx > - pop rbx > - pop rax > - > - ; > - ; Establish stack below 1MB > - ; > - mov rsp, r9 > - > - ; > - ; Push ultimate Reset Vector onto the stack > - ; > - mov rax, rcx > - shr rax, 4 > - push word 0x0002 ; RFLAGS > - push ax ; CS > - push word 0x0000 ; RIP > - push word 0x0000 ; For alignment, will be discarded > - > - ; > - ; Get address of "16-bit operand size" label > - ; > - lea rbx, [PM16Mode] > - > - ; > - ; Push addresses used to change to compatibility mode > - ; > - lea rax, [CompatMode] > - push r8 > - push rax > - > - ; > - ; Clear R8 - R15, for reset, before going into 32-bit mode > - ; > - xor r8, r8 > - xor r9, r9 > - xor r10, r10 > - xor r11, r11 > - xor r12, r12 > - xor r13, r13 > - xor r14, r14 > - xor r15, r15 > - > - ; > - ; Far return into 32-bit mode > - ; > - retfq > - > -BITS 32 > -CompatMode: > - ; > - ; Set up stack to prepare for exiting protected mode > - ; > - push edx ; Code16 CS > - push ebx ; PM16Mode label address > - > - ; > - ; Disable paging > - ; > - mov eax, cr0 ; Read CR0 > - btr eax, 31 ; Set PG=0 > - mov cr0, eax ; Write CR0 > - > - ; > - ; Disable long mode > - ; > - mov ecx, 0c0000080h ; EFER MSR number > - rdmsr ; Read EFER > - btr eax, 8 ; Set LME=0 > - wrmsr ; Write EFER > - > - ; > - ; Disable PAE > - ; > - mov eax, cr4 ; Read CR4 > - btr eax, 5 ; Set PAE=0 > - mov cr4, eax ; Write CR4 > - > - mov edx, esi ; Restore RDX reset value > - > - ; > - ; Switch to 16-bit operand size > - ; > - retf > - > -BITS 16 > - ; > - ; At entry to this label > - ; - RDX will have its reset value > - ; - On the top of the stack > - ; - Alignment data (two bytes) to be discarded > - ; - IP for Real Mode (two bytes) > - ; - CS for Real Mode (two bytes) > - ; > - ; This label is also used with AsmRelocateApLoop. During MP finalization, > - ; the code from PM16Mode to SwitchToRealProcEnd is copied to the start of > - ; the WakeupBuffer, allowing a parked AP to be booted by an OS. > - ; > -PM16Mode: > - mov eax, cr0 ; Read CR0 > - btr eax, 0 ; Set PE=0 > - mov cr0, eax ; Write CR0 > - > - pop ax ; Discard alignment data > - > - ; > - ; Clear registers (except RDX and RSP) before going into 16-bit mode > - ; > - xor eax, eax > - xor ebx, ebx > - xor ecx, ecx > - xor esi, esi > - xor edi, edi > - xor ebp, ebp > - > - iret > +; > +; Required for the AMD SEV helper functions > +; > +%include "AmdSev.nasm" > > -SwitchToRealProcEnd: > +RendezvousFunnelProcEnd: > > ;------------------------------------------------------------------------------------- > ; AsmRelocateApLoop (MwaitSupport, ApTargetCState, PmCodeSegment, TopOfApStack, CountTofinish, Pm16CodeSegment, SevEsAPJumpTable, WakeupBuffer); > @@ -596,8 +449,6 @@ ASM_PFX(AsmGetAddressMap): > mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncAddress], rax > mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.RelocateApLoopFuncSize], AsmRelocateApLoopEnd - AsmRelocateApLoopStart > mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.ModeTransitionOffset], Flat32Start - RendezvousFunnelProcStart > - mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealSize], SwitchToRealProcEnd - SwitchToRealProcStart > - mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealOffset], SwitchToRealProcStart - RendezvousFunnelProcStart > mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealNoNxOffset], SwitchToRealProcStart - Flat32Start > mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealPM16ModeOffset], PM16Mode - RendezvousFunnelProcStart > mov qword [rcx + MP_ASSEMBLY_ADDRESS_MAP.SwitchToRealPM16ModeSize], SwitchToRealProcEnd - PM16Mode