From nobody Mon May 6 19:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58787+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58787+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588856834007294.0485652793534; Thu, 7 May 2020 06:07:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZoDgYY1788612xO91vQZWIhL; Thu, 07 May 2020 06:07:13 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web12.5359.1588856830404711144 for ; Thu, 07 May 2020 06:07:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qq++KV3i9h+xHnUN+J+WlZdKekEkumhN1FHy/vLJjioF+5O78gth9NONI8hAyCHhYqanzrqiNrf3oV/gu2jeLekgD2jNhJmfGlLvmYBaIHI2xfHCNtQ9+KvBOZ/VcfBSccIjkPbAU+6DbRvqINxrtdB/TO6xwthfD/z3SYSvJDXEp9CPQBUzgkyDkLIBzcO70ZryNiFx2C/iMTKFfZ6gQMSqvxPLQxjYE2BM2F+TClQv2PvPPAFnDgd06zmK9XECxT1iWmy2Zhw6TYYfnbGnZedy1wxFRgXlHbPmsyoLi8tqnGW34c8enPeZ0HxsINsauAv5m1tN25Nr2Fqi1yuD9Q== 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=gRbx+mPmv3/gqk972jtO6N7AVyfjH/Rd5ylvrBysAcE=; b=jLFeYI9xe+MXvBU9KUm4g+mfMsUH6uFbV0dMsYQTlQmmxbs8qMn6FOG9hfd6HxG7wvzwDOnIpaWu9q2pyb5d7gnX/0dihfBfw+TE4VORPLa16uw00wtWWtf75gduOfU5e7MDVfNLEsWYYFNynKzMZNBPqNHrjVZ96U0abiipYJrbJHxiidhek+hFQ3fXZhPJyW280MZ6RRo8lh7Boz0CkHs748xJlB+espXFiknXtZMmoFG7U7+mvFdZv5kKUt5It08Yk/Dwwf/SSEtDkMjo6OdfE1ZD+s4Y4+iQ+tjR7PJEKZAClzY1nhCWd6lh/YGSIJXgo2jtlM53Nl4rhphc/Q== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB1819.namprd12.prod.outlook.com (2603:10b6:3:113::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Thu, 7 May 2020 13:07:09 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1%10]) with mapi id 15.20.2958.034; Thu, 7 May 2020 13:07:09 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Liming Gao , Eric Dong , Ray Ni , Anthony Perard , Julien Grall , Brijesh Singh , Andrew Fish Subject: [edk2-devel] [PATCH v3 1/3] UefiCpuPkg/CpuExceptionHandler: Make XCODE5 changes toolchain specific Date: Thu, 7 May 2020 08:06:48 -0500 Message-Id: <9075570487616c731033a5738f6a444a15d71b74.1588856809.git.thomas.lendacky@amd.com> In-Reply-To: References: X-ClientProxiedBy: SN1PR12CA0109.namprd12.prod.outlook.com (2603:10b6:802:21::44) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN1PR12CA0109.namprd12.prod.outlook.com (2603:10b6:802:21::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28 via Frontend Transport; Thu, 7 May 2020 13:07:08 +0000 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0621685c-d321-4857-6404-08d7f2878ca6 X-MS-TrafficTypeDiagnostic: DM5PR12MB1819:|DM5PR12MB1819: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1091; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: xS+j14r1pqufUD8Ty9gEz1KqBpi1387MxrbgvwII6dv45S1QcwLr7zUoamlNOI82jinTjT0gbTklpE7pz7B+4f9Tgfepo3QMp7V3vJqQpiR1ZIPpUE4+vNa8eJMl40aVSRXfH5D9jLadiO5X28ZbT4VvJ43oQeHNFM/PfJlxiKDh+xFyXxtoiKMKk61G1s2Xkydza5zfw1aKMRhI/lfoWBCzHaRIbiiBEuWMQ3XgjROdaTOFhx9rFyGE6B78ldXH3juEHTmW4rlN2ABNw7tAQ9T1TPprANAyzDNb09p9HW1qCqut++LJHCVaG+MS3Ln41JjCJ/WNSNQNKLPwSBDT4EcWjBLUhf68nPp/SZMe+nXL+1jOvlfAsRJrY6C9Q2xiXsl7VFvGjXsYp46y+QlsX1faK4LiaGBXNgM/zaHvcxc07hjJC3zJet+y4xaEf7Oz4F5xTTUSg9j35EEw+fsnJ/D9MTxiEJ8dF/7wfzFl6q8cGdReFLSXeZTkM06qvg146n1gWa4gXSBMISaH9Zrk8GLtwEzTXtRSMwIxzFyS7YP8w2VPDJi21cwGY/pKlDY6HIH58Ja4Va1u4WkE7IDvDTr/pTHDiPwilBrkKoOmxrX6B3ifUTzfNlVP/NgrJO3qJpczdigbFj6c1g9f16qtQQ== X-MS-Exchange-AntiSpam-MessageData: R5aOwWX3vtTh4U9Jap9A+uSlydggNFIcBNzpETJl1yXEMMlub6yH8Rglbfv4JxnVh8f+zIp+YKxiDhHn1T3o2q/xP8NUpmJEzr1SQbXOGfC61Svb5wBWwsy2EisnMSKywITMgW812NW5RHsSNuer0LO57AvNol9+/rChXYbNz75m2yH4in5Bs508/D0q6nt8Qd14+4b/N4Ng1I7SGl+lhOijfDeFwrE66Qo9gep5bGhnevkcTvC9fNmkVxI44WAgCNdJwU2eQSRum2emK9NJxfcA/Kwn3d4EH9FCRAOBo5Z2hZfex/F42bFWCANXP5aQY7bt7TNpebKiTNWJjwjHWY/+KHTAXB8z7ePpM8mLaFSULggTbq0WcQsLFkvcBRw7A+l5ffEhWfSGa4sb80Hzgf69VydIgUrjbsjB1ld/eTvzQ2UWex8LIfXsqfKHoLSjW0bNSx8NdcgweBxOhbn1TrWfW30ukVAt5ltbUWu19HtgToJsdpXXMO+s3shNl6InbqnCaWUHnxcwj/+qer3YV4Nx7bKqQnNYsGTNYTpBFdOsu4rBeotf7loBgqkga/nm4La827ZCD4ubVfQjAdMqEjlIaqnp7K6kxh/HESW3VSVv80VVLQyy46UDhRNqWuxiLb8DeCHY5GhN0vDTZ2cX6xfErHs2oj4/TOnkoW/KpH02BZ5zc6YFNdP1n777Qav949aQUzDJae/DXK+FFRMzTd9S2JvwZynxrF2q06cqSpPSvIZC8elEbPN9jmk/uyZ/TX1YVDlRU3W0pmmVyCkCz8XeUmVqLIBJ6MSIayU8xSc= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0621685c-d321-4857-6404-08d7f2878ca6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 13:07:09.3744 (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: 9SjmYCgMRXxxBHaQoyi4ylI1XMxjeg/ja4r5xoRMoAKFQfbTK4nRu/OrRmK2as31mcsn6K24azVIpKSg8DwSxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1819 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: QNPXQl6cviCbjZQQwkOvWQMEx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588856833; bh=rgJa7xIj57nV3Iz7jV6p/69IzUHL4lIDSBuMCdLmk6o=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=T0gVEzIpCDiq14hgYkltnErbTyDfZCMxmRcv34ZhiE2MymjCv8JhPOVXLlaMIJVBri4 5xsRyCAQeaVey/WCMFfmWxgf/ZaDX9c01hWT8bOR0fz+IC/C9pq9e6hpxRC+tz8ICEqmi CpUOWwhztIJDKrWqg73zEyz5d3wiHNnF1wM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2340 Commit 2db0ccc2d7fe ("UefiCpuPkg: Update CpuExceptionHandlerLib pass XCODE5 tool chain") introduced binary patching into the exception handling support. CPU exception handling is allowed during SEC and this results in binary patching of flash, which should not be done. Separate the changes from commit 2db0ccc2d7fe into an XCODE5 toolchain specific file, Xcode5ExceptionHandlerAsm.nasm, and create a new SEC INF file for the XCODE5 version of CpuExceptionHandlerLib. Since binary patching is allowed when running outside of flash, switch the Dxe, Pei and Smm versions of the CpuExceptionHandlerLib over to use the Xcode5ExceptionHandlerAsm.nasm file to retain current functionality. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Liming Gao Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- UefiCpuPkg/UefiCpuPkg.dsc | 7 +++++++ .../DxeCpuExceptionHandlerLib.inf | 2 +- .../PeiCpuExceptionHandlerLib.inf | 2 +- .../SmmCpuExceptionHandlerLib.inf | 2 +- ... =3D> Xcode5SecPeiCpuExceptionHandlerLib.inf} | 13 +++++++++---- ...Asm.nasm =3D> Xcode5ExceptionHandlerAsm.nasm} | 0 .../Xcode5SecPeiCpuExceptionHandlerLib.uni | 18 ++++++++++++++++++ 7 files changed, 37 insertions(+), 7 deletions(-) copy UefiCpuPkg/Library/CpuExceptionHandlerLib/{SecPeiCpuExceptionHandlerL= ib.inf =3D> Xcode5SecPeiCpuExceptionHandlerLib.inf} (64%) copy UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/{ExceptionHandlerAsm.na= sm =3D> Xcode5ExceptionHandlerAsm.nasm} (100%) create mode 100644 UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiC= puExceptionHandlerLib.uni diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc index d28cb5cccb52..afa304128221 100644 --- a/UefiCpuPkg/UefiCpuPkg.dsc +++ b/UefiCpuPkg/UefiCpuPkg.dsc @@ -59,7 +59,11 @@ [LibraryClasses] =20 [LibraryClasses.common.SEC] PlatformSecLib|UefiCpuPkg/Library/PlatformSecLibNull/PlatformSecLibNull.= inf +!if $(TOOL_CHAIN_TAG) =3D=3D "XCODE5" + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5S= ecPeiCpuExceptionHandlerLib.inf +!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf +!endif HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf @@ -123,9 +127,12 @@ [Components.IA32, Components.X64] UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf +!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.i= nf +!endif UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf + UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHandle= rLib.inf UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandl= erLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandle= rLib.inf index e41383573043..61e2ec30b089 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.i= nf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.i= nf @@ -28,7 +28,7 @@ [Sources.Ia32] Ia32/ArchInterruptDefs.h =20 [Sources.X64] - X64/ExceptionHandlerAsm.nasm + X64/Xcode5ExceptionHandlerAsm.nasm X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h =20 diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandl= erLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandle= rLib.inf index f31423ac0f91..093374944df6 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i= nf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.i= nf @@ -28,7 +28,7 @@ [Sources.Ia32] Ia32/ArchInterruptDefs.h =20 [Sources.X64] - X64/ExceptionHandlerAsm.nasm + X64/Xcode5ExceptionHandlerAsm.nasm X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h =20 diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandl= erLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandle= rLib.inf index 66c7f59e3c91..2ffbbccc302f 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.i= nf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.i= nf @@ -28,7 +28,7 @@ [Sources.Ia32] Ia32/ArchInterruptDefs.h =20 [Sources.X64] - X64/ExceptionHandlerAsm.nasm + X64/Xcode5ExceptionHandlerAsm.nasm X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h =20 diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHa= ndlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExc= eptionHandlerLib.inf similarity index 64% copy from UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandl= erLib.inf copy to UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionH= andlerLib.inf index 6d25cafe2ca3..7e21beaab6f2 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLi= b.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHan= dlerLib.inf @@ -1,16 +1,21 @@ ## @file # CPU Exception Handler library instance for SEC/PEI modules. # +# Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved. # Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # +# This is the XCODE5 variant of the SEC/PEI CpuExceptionHandlerLib. This +# variant performs binary patching to fix up addresses that allow the +# XCODE5 toolchain to be used. +# ## =20 [Defines] INF_VERSION =3D 0x00010005 - BASE_NAME =3D SecPeiCpuExceptionHandlerLib - MODULE_UNI_FILE =3D SecPeiCpuExceptionHandlerLib.uni - FILE_GUID =3D CA4BBC99-DFC6-4234-B553-8B6586B7B113 + BASE_NAME =3D Xcode5SecPeiCpuExceptionHandlerLib + MODULE_UNI_FILE =3D Xcode5SecPeiCpuExceptionHandlerLib.uni + FILE_GUID =3D 49C481AF-1621-42F3-8FA1-27C64143E304 MODULE_TYPE =3D PEIM VERSION_STRING =3D 1.1 LIBRARY_CLASS =3D CpuExceptionHandlerLib|SEC PEI_CORE P= EIM @@ -28,7 +33,7 @@ [Sources.Ia32] Ia32/ArchInterruptDefs.h =20 [Sources.X64] - X64/ExceptionHandlerAsm.nasm + X64/Xcode5ExceptionHandlerAsm.nasm X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h =20 diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandler= Asm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5ExceptionHan= dlerAsm.nasm similarity index 100% copy from UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm= .nasm copy to UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/Xcode5ExceptionHandle= rAsm.nasm diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExcep= tionHandlerLib.uni b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPei= CpuExceptionHandlerLib.uni new file mode 100644 index 000000000000..a63b25f39d99 --- /dev/null +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5SecPeiCpuExceptionHan= dlerLib.uni @@ -0,0 +1,18 @@ +// /** @file +// XCODE5 CPU Exception Handler library instance for SEC/PEI modules. +// +// CPU Exception Handler library instance for SEC/PEI modules when built +// using the XCODE5 toolchain. +// +// Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved. +// Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.
+// +// SPDX-License-Identifier: BSD-2-Clause-Patent +// +// **/ + + +#string STR_MODULE_ABSTRACT #language en-US "CPU Exception Han= dler library instance for SEC/PEI modules with the XCODE5 toolchain." + +#string STR_MODULE_DESCRIPTION #language en-US "CPU Exception Han= dler library instance for SEC/PEI modules with the XCODE5 toolchain." + --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58787): https://edk2.groups.io/g/devel/message/58787 Mute This Topic: https://groups.io/mt/74049686/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon May 6 19:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58788+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58788+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588856834944264.47596010728387; Thu, 7 May 2020 06:07:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id vlAFYY1788612xYtmbpfKzjF; Thu, 07 May 2020 06:07:14 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.40]) by mx.groups.io with SMTP id smtpd.web12.5362.1588856832136708903 for ; Thu, 07 May 2020 06:07:12 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kKDE+pI03MLTKXrZFTDtD573zuF+KBeXFfWp8dC4VIHl+gr8k0HPcvEyjboyv6u5J5HMVWhmdvz4YKHrqRFHtBCNrMQVA8iKNxTiNxuhTtNkDGY9M39HCFU155r4UQ13rneLIYYO72VRmt4MjX2/LW9ORbsChLtMFI6eFYbcv//b2NDYMXMJIdB8gkq4ReacWWA7VHO5ThyWF9SvHxSC+YOwGpYneTiWll/TcPJhBKyVO+rICRS4HAJ1dz20WNhzNdO8f5nACD3d1lxnQRtKYoqu/0APWZ9+uPDZ3XHhoQ1gORWbju2K2nUFYoOUPPWfFAE88hNOv9h3T0RxI1F3ng== 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=XmYJUGVsEBGMWuXWROwKuec836lYid4j3UYw26zFCrI=; b=ZyFXVCtG1pYIfx4gabfMVaVw+3VC4ficxHy0ohW1lif9DwH3q8a5HnNPE8+Wtb79h/93liSMmAh02jDCo8lV0VpNVJXuHUQaK4aAhvC39ba3eA+iURCkTQeaaf0xt4jGNx/XM1FUTO+jER5KwKFvyp6z5IE3GIfdbsjaZ2gzLidfpptNWZrhXU+XyyArBHmqJvHTj+Io2I3Y++xsfUEahU0dKRFCmZsARpIFKkA9modMwXYAV6DzbLPpah+xONwHb2sQ2i/azy1raozI0yuJj7IgJQj50b9Z4buY8miKCXf9M9uvLV+NKFyDmCbrk8Co2ShnDO2qznsOvzQS1qaWSw== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB1819.namprd12.prod.outlook.com (2603:10b6:3:113::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Thu, 7 May 2020 13:07:10 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1%10]) with mapi id 15.20.2958.034; Thu, 7 May 2020 13:07:10 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Liming Gao , Eric Dong , Ray Ni , Anthony Perard , Julien Grall , Brijesh Singh , Andrew Fish , Ard Biesheuvel Subject: [edk2-devel] [PATCH v3 2/3] OvmfPkg: Use toolchain appropriate CpuExceptionHandlerLib Date: Thu, 7 May 2020 08:06:49 -0500 Message-Id: <0cfdd51deb6d39e08380645f2022b9b76e29f66f.1588856809.git.thomas.lendacky@amd.com> In-Reply-To: References: X-ClientProxiedBy: SN1PR12CA0109.namprd12.prod.outlook.com (2603:10b6:802:21::44) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN1PR12CA0109.namprd12.prod.outlook.com (2603:10b6:802:21::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28 via Frontend Transport; Thu, 7 May 2020 13:07:09 +0000 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0f1c1b4c-7a84-4a51-8ccf-08d7f2878d68 X-MS-TrafficTypeDiagnostic: DM5PR12MB1819:|DM5PR12MB1819: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 1d8T/tkQYx7ulHF8xaSkLMKScSOQjdf7PInMkMx6rWm91hKx+71WMP/F1HuaPdZsrxQSNrZ6L7M/+P5by+iKOxcqmJoG3I7AX5rQCY74CeIS4bT91q97z71lp2dDGtb21kEJYB6TMzBM/T4jljWVimU09RVc1bv/gQM99MlFx2ajGHDGCXkCn0nrTFklIKUIiWDeSRPen5BTkDtkRU5mm/lyldyr2Plm7zyMO8x+4T3xVO+KkpYFA0UFnvWS0JbA7rGm6/3mDHPSsnpLNTbVjF2tUQClPZXtJiKh8wiVVX/56tnRJnDEb0ufsSGyIXL+aRIEA4O2idnQS7EUWGH/h3Cz8mvO+MWEHy5f0O4oys3anI5RJL+j9PWehUsuTXbDqhNyW3DpwjYc9ODa3vTjhA5e0M+1pnCjVHXqK5UDr9idR9UNK1SaDymT8cn0/5Yrwu1kK+1kGnZPRJnaPV92o+xQV7Y4VjnNL6JNvInZDFjx6jV10+xZLfP4jE7mMC8gcUwdMG+Hsgn4jx6cevdBexFSWyTibuqr8kOSGi2JxYPbpcDTe9hs2DETuNWUB39vOG23dzqyA0xJI9Zs+e9Z17XutCImoc8cY9l/oj1G5Clkdsmtu9mjNdBBep30gDgJVofM+va9xKgtilyfw/CoFg== X-MS-Exchange-AntiSpam-MessageData: Ajc3kjiKoEXjZsRjw3GgQB/wjOPkmSa7/ssXE/hlRIdtGtLUKNGezLTtuEX5dXGi4daPXRdzRj1N2y/1sb8176ug51qbm+XHSWYGc7hRKglX7Lnr8qhW+cyAZ98Nrv8JSyUukW1DiBkKMO0wD1WNdHgoF0fAygIQ3htWWjH0+/Xc/c43r/G5Uel/Y+gL4buLdV55tSKQ/bWNNKT1pjU2abpkU6vGrJ2DhSKNqrgB0GitpbYKRa0dDL2Bq0nvOzx7ifrYabQX1y0KEqizb6LKL1rIRv+/6dAjublc1SQ2kVexo2rz3dLHvw+2qe0sEr6EcMQHbBd9cLDCxFgMjVt7h6z0C3Ek3yBhmttvPXceh/N9llN6PXjm8it0h1p2PerzpTqwxB0WQUXM1d2bJTnTOfMRTGNOdqDsa04vRM8EuCq+mjClGfmTqY/CReS1lu1vB+MvHOe6Mj29+/Cf2fli5wA1EwSmUrRUwSrF5Yh6vPVKnTnUUWcZ5i3oSZzl4q3PhAZnkQSTG3O+gCofE7zxsQu4CfdZbx6DtEQFZ83+cs+Naij/TJpJwkeFOeVB6B6sKTadXHnuw+nD9LQl9fquAFjUkzVjXkWUuhkYN3fcy27BIjuxqMBJp01shGpbwVRl+xXU6RRKpKKAWFKPxeZRraY3C3SU9lgiPk6zFqwmhYTpdO1FU91IBbcZOfZxavOUrgDntcyn4PKnDj7Mc9UMpuSGclGOEFTllTJzKkfaFSFo49zt/wixbsa08dfAqH4aIOLC53OvWH6kgXPIz+9tRMZ91zWzi2llIoZv7NeK864= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f1c1b4c-7a84-4a51-8ccf-08d7f2878d68 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 13:07:10.5859 (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: 4HSCfpQHsRexNml1ucs2BxnvzH5fnhU7m33tEjdtcoTGSV2XdEAGiBRnkfZDXAEfqCW8TU2VBaRX2bbItBe+qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1819 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: II4PNVyixxWCgrtMlia4fjRhx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588856834; bh=AmLCTSPb1eBl046qOIhKre61+kYc/id621ZkEjGgSvI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=u5aY3eBA6OzSoU6Gn6vRLexs8LYFJMjpgHX6OP5DX4J2cZ33kYipM8kXUpxmt5gXWw8 0cPGsSAc/8pJZM3+kT9pREBwfJKy71zpw1JLu9Qi3URC8sd8vT2k2c+TD63aPy4U6jHEv jIfKcJT6nQXuS6rYM6nGLKMPTTLQSS5OlrQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2340 During the SEC phase, use the XCODE5 CpuExceptionHandlerLib library in place of the standard library when building with the XCODE5 toolchain. The SEC XCODE5 version of the library performs binary patching and should only be used when building with the XCODE5 toolchain. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Anthony Perard Cc: Julien Grall Cc: Liming Gao Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- OvmfPkg/OvmfPkgIa32.dsc | 4 ++++ OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++++ OvmfPkg/OvmfPkgX64.dsc | 4 ++++ OvmfPkg/OvmfXen.dsc | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 7c8b51f43b66..41ac3202961b 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -246,7 +246,11 @@ [LibraryClasses.common.SEC] PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf +!if $(TOOL_CHAIN_TAG) =3D=3D "XCODE5" + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5S= ecPeiCpuExceptionHandlerLib.inf +!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf +!endif =20 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index a0596c44168c..c2f11aee2cec 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -250,7 +250,11 @@ [LibraryClasses.common.SEC] PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf +!if $(TOOL_CHAIN_TAG) =3D=3D "XCODE5" + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5S= ecPeiCpuExceptionHandlerLib.inf +!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf +!endif =20 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 2e764b6b7233..643e6041ad53 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -250,7 +250,11 @@ [LibraryClasses.common.SEC] PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf +!if $(TOOL_CHAIN_TAG) =3D=3D "XCODE5" + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5S= ecPeiCpuExceptionHandlerLib.inf +!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf +!endif =20 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index 8b3615e0b07e..143dc6d5a766 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -228,7 +228,11 @@ [LibraryClasses.common.SEC] PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf +!if $(TOOL_CHAIN_TAG) =3D=3D "XCODE5" + CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/Xcode5S= ecPeiCpuExceptionHandlerLib.inf +!else CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiC= puExceptionHandlerLib.inf +!endif =20 [LibraryClasses.common.PEI_CORE] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58788): https://edk2.groups.io/g/devel/message/58788 Mute This Topic: https://groups.io/mt/74049688/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Mon May 6 19:23:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58789+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58789+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588856835424520.5640249356583; Thu, 7 May 2020 06:07:15 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id oDFSYY1788612xGVwBpGDmW9; Thu, 07 May 2020 06:07:15 -0700 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (NAM10-DM6-obe.outbound.protection.outlook.com [40.107.93.53]) by mx.groups.io with SMTP id smtpd.web10.5495.1588856833204637785 for ; Thu, 07 May 2020 06:07:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dvNOaUl3LtMs0Y1v2RXL7qRgwWwmwdIuE9AZJ6AX8U6nX4pG3Qm4YkrKQwjnHfpEUOWxUxNVKOcQR0LFc3EGRAX/0WF+gwcRQbmKkyExuxC7kAEN+4FIPSpdrTd//5DKH2heBXOJtq/sy5pXlx3kfZpLUeyDnnqRDP7sfdajNfhDV5+tmrFpEF7Iwoi1HrVn/xPGvwsm9iuj1axCdkzSvRCw0NFbbQrgPaMkV0LnphK75Kbait1dqyIpbtb9mE39KJYaY6mB5c+YePF7KfbKndIjDzhCdSPq/Lt8lgLyZ9jwYwY3uZ+xE4j7gDmC0wRGSLfNuMBLm1Gp/krJAhFPbA== 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=LijOWzWFZmTUJyrXWatr2ub7vGJ+M3NwrWHnYsGCuaw=; b=h261gyDK+qhLed+c9EFdMyJXc4BS80K414z4Jk4tWkjARgqchs4y+2UZriAOvUklXJbhsV7cFWqR/ewlHxsirpEC6APGwntMgsMT0aRUGYym2nJ3PfYdllKYpgj0AFateUfsGbk0Jtb9KD/CFcbSs8k+SMT5en3UJ1lMy/XNAja/AQJGTWqWswolaC+Wj5Do2u35w+0AgP1wZOnhMuC4Od4njLY9HkjtRkOW+S7BzXTZ/C30HLJ906+AWn6ufPY4JsLPiuYQFIrA3+HpHOtFhewdRnp3uLRVe+fDhsv+/jr80HpX2Y7yksHkuy/wkYT85e4HFxrIhAXMUQam3glI5Q== 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 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR12MB1819.namprd12.prod.outlook.com (2603:10b6:3:113::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Thu, 7 May 2020 13:07:11 +0000 X-Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4ce1:9947:9681:c8b1%10]) with mapi id 15.20.2958.034; Thu, 7 May 2020 13:07:11 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io Cc: Jordan Justen , Laszlo Ersek , Ard Biesheuvel , Liming Gao , Eric Dong , Ray Ni , Anthony Perard , Julien Grall , Brijesh Singh , Andrew Fish Subject: [edk2-devel] [PATCH v3 3/3] UefiCpuPkg/CpuExceptionHandler: Revert CpuExceptionHandler binary patching Date: Thu, 7 May 2020 08:06:50 -0500 Message-Id: <810f67d8604c054c09d17a22f0bcfaeb41ee8e3b.1588856809.git.thomas.lendacky@amd.com> In-Reply-To: References: X-ClientProxiedBy: SN1PR12CA0109.namprd12.prod.outlook.com (2603:10b6:802:21::44) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from tlendack-t1.amd.com (165.204.77.1) by SN1PR12CA0109.namprd12.prod.outlook.com (2603:10b6:802:21::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28 via Frontend Transport; Thu, 7 May 2020 13:07:10 +0000 X-Originating-IP: [165.204.77.1] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3c291f70-71be-4a7e-8204-08d7f2878e1e X-MS-TrafficTypeDiagnostic: DM5PR12MB1819:|DM5PR12MB1819: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:626; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: RgeMGoZcFz/hI2OO/EqsoUvFDLC+Sohg3YqvAOwIswqjgbq4aE/oJaiuJEx7PJmhHokVpWozPsvaBL6yNuzNCqJH7UY3kqTA0IJEnOwyobxwfzSujiQScRO59YXpRGzyQgYSNjek2YSRneD3ZCMZuQXc9F7vpe44g0KqsBiATG8KteKVNGsoPpz0wB9/5qJDEnVWGENnnjMq2AjH86TVV6SmuDkbfbeehR21Dvk1KPuyErWvCefCrLRSc9oKeMfcASSK3m3cmvz2JsiiR16evlCtybMxnVnw8N+hu2FigISNafkGq9tAetNiI1A/jsh9ftf0pQne/qjMG2GF1Kz2RGFveuwzwElXbYy8+zYry8TyZZagQPE5HZMOotV+v0w2Mqa7S2Q2GWg3IQuZtued/h6r3xbpu2T39nLFDlcGw9Wa1W1j/6W81OR+TxKddpX3kY7vo0IFvvXIjhhZQMaVo2hP0Bz6U2KE++gMG6pJ0LMM8DItDNShmYflzEj3pKQRql71vsNS/Dt0BftXe3WnNt8vRZHxsldjk2LT4DtsW/miRqrOrCEtdnSJNIEObcGSV6LhsKYcDgLu0naLyiV2YA7aq10X4Q6E9ZYtG2qg+t2P2NyQngORB5+gSOPzCdtaIlIbKjBwb3Hi/f0OdIoGoQ== X-MS-Exchange-AntiSpam-MessageData: RoW/JvzvHSDjOWGfVSUjj0mpQGoWJgQajKN26ecq/ieRdXxlis3sNFrq6wL86xHoQmXdmGSWvwLiZj+i4HFzSwEkwUUcURDcNpGNQsL6g2ic/Gseb+qT1+2ikJ2A9oHKgcW86YYtKQssuSeBtTwoyBHXipIMQ2P5gFkDBrK0d4UFUTZ62VnOGCXDks5Lm0ImAmtNUqg2iwe4MKv1eElj4PBWglj4hPSShRuqOMEZIWDTyBGW/JTjlHccM2z7exmFXMNftN4lV2gt7gAOMfMnN3mFGZGryY2XYWtdWGBBXuiuLRdwWaWURr6OtMSzqNE6TtgS79ARqTVselph4IiGG4X6dO0W+imPgI2X9oHhqMHSpUGvMaPPjeyEBdNmt3f7PHtEmb7E084fPPlDpZb3wh7fS/9q/t4OHBCG4eW7cUaEWGS/BykTzN3QwktyZoJtvihs7Kp1hB8f63fROzlWHmklzr85J2Q2dMS0SM1dYodmuIt99XS5qo/ZT9XJcVYh8oQxvyDLXXD4ymsCeIjzT8W0HhXZgB7FcGcHAj1y1g90Tq3tp6JLN/OnlXtL8G7xqM7W8qzTZrsDWk3AQkSOM6mUZPQHS0eryhLP39PdckGTQHdC4nlcdeHNo4qhFOpj4RYSTn8mD96RYox6CyCtzBVpeuyO9yQeNHCiYog8qnfK/8cDJAXRREnG1x/CvztAsG9XxSZ0gLefSTbhuQ9w344UC9C8i1PTFjOJ7aFSG9qfcHU4/KyvB4uP7u6CDQsXN34Uhv6N27mkMp65fL48L+ok4FkBgvZDrljpRthE09E= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c291f70-71be-4a7e-8204-08d7f2878e1e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 13:07:11.7294 (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: zuJ/3eOv6MzykWrWARQ+jC3FRc0v28zLyhN1w5zcpI6ueMETcd/TxZ5VtWh54XYYSRvMEb/v1OnZ+L2rJCj2yA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1819 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,thomas.lendacky@amd.com X-Gm-Message-State: OZwray5zw8xPSUrhsVjqUw7Sx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588856835; bh=xy3jxk8AIWwwuOx1SvBOPdB2WANPCOin0u96WoCT8o4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=YODZmRLcECKbINa6jg8nHNyuOEWDZm7oIzdVyKXRwOusHx1tu8VuVrO8zrGwtIEdcQq OogsI9GtOJMHqabz2GklANiMpmoKzivTP4MHQtqFpZny8cHi8eXjR1mtaa0g6gJm1XgoB OfWCE/Lpyg38/tVowEnagYHk1tiIQCyYK8c= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2340 Now that an XCODE5 specific CpuExceptionHandlerLib library is in place, revert the changes made to the ExceptionHandlerAsm.nasm in commit 2db0ccc2d7fe ("UefiCpuPkg: Update CpuExceptionHandlerLib pass XCODE5 tool chain") so that binary patching of flash code is not performed. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Cc: Liming Gao Acked-by: Bret Barkelew Reviewed-by: Laszlo Ersek Signed-off-by: Tom Lendacky --- .../X64/ExceptionHandlerAsm.nasm | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandler= Asm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAs= m.nasm index 19198f273137..3814f9de3703 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm @@ -34,7 +34,7 @@ AsmIdtVectorBegin: db 0x6a ; push #VectorNum db ($ - AsmIdtVectorBegin) / ((AsmIdtVectorEnd - AsmIdtVectorBegi= n) / 32) ; VectorNum push rax - mov rax, strict qword 0 ; mov rax, ASM_PFX(CommonInterruptE= ntry) + mov rax, ASM_PFX(CommonInterruptEntry) jmp rax %endrep AsmIdtVectorEnd: @@ -44,8 +44,7 @@ HookAfterStubHeaderBegin: @VectorNum: db 0 ; 0 will be fixed push rax - mov rax, strict qword 0 ; mov rax, HookAfterStubHeaderEnd -JmpAbsoluteAddress: + mov rax, HookAfterStubHeaderEnd jmp rax HookAfterStubHeaderEnd: mov rax, rsp @@ -257,7 +256,8 @@ HasErrorCode: ; and make sure RSP is 16-byte aligned ; sub rsp, 4 * 8 + 8 - call ASM_PFX(CommonExceptionHandler) + mov rax, ASM_PFX(CommonExceptionHandler) + call rax add rsp, 4 * 8 + 8 =20 cli @@ -365,24 +365,11 @@ DoIret: ; comments here for definition of address map global ASM_PFX(AsmGetTemplateAddressMap) ASM_PFX(AsmGetTemplateAddressMap): - lea rax, [AsmIdtVectorBegin] + mov rax, AsmIdtVectorBegin mov qword [rcx], rax mov qword [rcx + 0x8], (AsmIdtVectorEnd - AsmIdtVectorBegin) / 32 - lea rax, [HookAfterStubHeaderBegin] + mov rax, HookAfterStubHeaderBegin mov qword [rcx + 0x10], rax - -; Fix up CommonInterruptEntry address - lea rax, [ASM_PFX(CommonInterruptEntry)] - lea rcx, [AsmIdtVectorBegin] -%rep 32 - mov qword [rcx + (JmpAbsoluteAddress - 8 - HookAfterStubHeaderBegin= )], rax - add rcx, (AsmIdtVectorEnd - AsmIdtVectorBegin) / 32 -%endrep -; Fix up HookAfterStubHeaderEnd - lea rax, [HookAfterStubHeaderEnd] - lea rcx, [JmpAbsoluteAddress] - mov qword [rcx - 8], rax - ret =20 ;-------------------------------------------------------------------------= ------------ --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58789): https://edk2.groups.io/g/devel/message/58789 Mute This Topic: https://groups.io/mt/74049689/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-