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 []) by mx.groups.io with SMTP id smtpd.web10.4191.1588782815925345691 for ; Wed, 06 May 2020 09:33:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=apxpAz1Y; 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=PRZGp3dNWLsSLfESXsvSUkx4hwy4/Yfad5lKgkjlaJdEEEB3AsbVvy3GAEgI6/gE+w3N+SpW+AjDjABfh+cI16MzshiNHD+Deo7Y83B1HRYoa3L+a17Ki+vfyMmO/cDjErb7IHcTPpFJ89sL64sbWYgUYiC+f0MrJaHFU4Xcllss3ZVOJAuPhEWatLA/gYUBZr0SyoVs/LSSum785v1JhdhEq8JrmZPs49effjp8sAxSzJPvcSBvG99Wp8+/ceiMqlJHT9Si6HNSFDqHvUtjbh16SZwPnGUlxQbs/P5tm1UnbwCUxC+rzQlSiwjtFAtXZqUs7XM6GldqpJgl8pRhKQ== 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=5uaoB4wGeuBb1pzLFBZ0smQWYTAl2gA/fuYFTpa4nAs=; b=G9dQi+usSAA9L9VXVp+nFiryQ7cV47rFcxxJJi3SwMVzohgx5DJWFfNIQIQTmAg/sPEhHZRzCObC6inefbyVV9gPe+a9tp0Lcg++swWSMyTJW5Nb++AhSqv+IqdQvjMWufkYom9843UtpKMNY+M9zmn85rdowlP2IPXmqgNnndYQ/CgUMatWI8cVa7L7XgOeM8LDJyE1ksuxYaoFojRM3hHEMzkQRHWzDsGlyz5ICRZeRb88tjmdM1PhpsAzHw1tsm1+Wb+nvug923s0Pf7UyFhnnl3vnPkSUKRs3DrwgNAwEgVwUdJ3hvEeLVSVdtHakMLjgT0/5ZL8sDmVvI3cGg== 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=5uaoB4wGeuBb1pzLFBZ0smQWYTAl2gA/fuYFTpa4nAs=; b=apxpAz1Y+bjuN2dnsNaVDCV9dhHzISYWdrrrrxI44H7FICtPU9MFTcv/j0N0pjyTw/Fnix7zkFcTNS2fS0UYzYy5e7HVuNYqGF79GuXCD/Cc95th4aMBlCJNUa5RmXdaWGQ8yrsctkmfWXJVVNQzAtH22bBhwNH682TrdjWbbsI= 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 DM5PR12MB2470.namprd12.prod.outlook.com (2603:10b6:4:b4::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Wed, 6 May 2020 16:33:35 +0000 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.030; Wed, 6 May 2020 16:33:35 +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: [PATCH v2 3/3] UefiCpuPkg/CpuExceptionHandler: Revert CpuExceptionHandler binary patching Date: Wed, 6 May 2020 11:33:02 -0500 Message-Id: <04d228920c68068ab367e298a943ad26718bb029.1588782781.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: DM5PR04CA0049.namprd04.prod.outlook.com (2603:10b6:3:ef::11) 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 DM5PR04CA0049.namprd04.prod.outlook.com (2603:10b6:3:ef::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Wed, 6 May 2020 16:33:33 +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: 0f6b88ef-2152-4955-eeca-08d7f1db3896 X-MS-TrafficTypeDiagnostic: DM5PR12MB2470:|DM5PR12MB2470: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:626; X-Forefront-PRVS: 03950F25EC X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EZsH6moBjAibQyFCFp5mLebMcKV8t1sg161OllCem96i5rrIJxUU9z4C+mLV+neUi+tQllGHuLn5vQwM1x82rnOdIwZ3cpSBoaT9h6qQ2TQi6N4GDmuEOMvAV+lj+YtHqxxBZ9P2pvYLlKe8SRf3lsdVOIaNP1pXgqmnOi/5pIaUvjxuL5JvT4AAFR58SvrU0YT6hFNFkRzhnA8Ahg0RffpqJ4D47sVbBUX6lPo+Xql++hOlCocbWFRlCIldoUx9C72lsOVH0yX7rkICY8vJcCn03uzKSglIuQDmLpKUddSlSVUYvrGN0pHQeuw5C34LZcqATGDmJbGYAwPp3Zrtl2fq5h4ofHZi8QypJrXJ3Zy5jEENgK9Wk4EQB9qviN8FRMHAZCMBFbOeCsLlNcfhZyB99s33km+Z03R+54tTmPb6iii4mrqvv1sH+NnMYUxWPczWS0O7XtJgydxejD8JO+icXRdi5t0nueMkYdRcjEzmaghYwQd8c0B2KhgvaUfYG33MwHhi51UDvijrydzW8IEyzsrfb0cZOVHk0mFBTNafhE2VhbM9+nRnfu4+5q9vpSa6ao5AIPTMMwruqaMozqMsMUQUxsEKgpblRjM8QrJyvl1FHLJ9JANhQPSTxZdI51vhusPtZCkCN3U+IU3apQ== 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:(4636009)(376002)(366004)(346002)(39860400002)(136003)(396003)(33430700001)(2616005)(6666004)(8676002)(956004)(7416002)(478600001)(8936002)(26005)(6486002)(66556008)(966005)(66946007)(4326008)(7696005)(52116002)(36756003)(186003)(16526019)(19627235002)(54906003)(316002)(6916009)(86362001)(2906002)(5660300002)(33440700001)(66476007)(136400200001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ssxLfYjtRldi9JctRV47ZKTfvLVNfRQspX4/jxFvuaRQbr2riNj0UxXBNOE3AM8dvNUGCixG8DvnH5fT1FcOm3BIQbPFWjJunGELdlv5wup1RdAj4M4BXSFHcyp1VPd6dkBkne4XbWoeheCO7SqiqxFcEV1U0cpVVpWoEkodKB1hs4TvAT6Iwz6GoIYrUD4ZcTtuXybXWE1zAfmSD2Ze4qDxPwRW0N0bBSn4eWB30Q5Qtpr+bhszH2mQxvtxKhr7OYkwhWRMZbau612H9PUwM/wnmIa3rE8v6uEQKPn4YmBtRa5TmZjkWmHlFpQaRlzaldGbljAifbfri6T4+BqRuQWOTqrzNOdqowRakPC29BsmFJqnq3oJk8oRsfM2dfObQt85G7xGQ+KapI/5fX0dCKu5AB5O9EgFB6CDeP3DlkGbUka1OZ7WnYMX5Epal1ShCQJXgZNPKRPoSDeRo9cpk8upfAE4soBFayQheq7uzGXl/17+YaPopBIYEYo2Dvi1apU+KyF9GqnNbuY2/8AXaT8NJLS/ccLkthNwdJQEKrdiXpk9UAsZXLm1lif6Tx5fcTbE4S+VGYh2tWH4Bo3N7JVGvOPmZg+7GYDdzNHHdPe9ZagCOaBBuGQwA3gtBN0S56DEk51qu2hmAtG9eDgHYvZBdACWQSLaGhTOIdtgkPOoXM4zdIAAFzkr43g42x/aprTml0Ja514WHh7suU3zFyc7TCYE5vzP9Ut6L2uNettPe3l6+sxK6gfRZd8uhLKSmA+66bYjP9qTpaRUznYI8/YVMlcitC3Yt+twi/JzwIM= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f6b88ef-2152-4955-eeca-08d7f1db3896 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2020 16:33:34.8160 (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: B+fZhMa+29OSryKrjl85Go7hCwtXsnkREHVT9NC0Sh5ujU+UYidr31091FCreDRR8LPshpgmsfMI6kCUgAy/Ig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2470 Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2340 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 Signed-off-by: Tom Lendacky --- .../X64/ExceptionHandlerAsm.nasm | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.nasm b/UefiCpuPkg/Library/CpuExceptionHandlerLib/X64/ExceptionHandlerAsm.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 - AsmIdtVectorBegin) / 32) ; VectorNum push rax - mov rax, strict qword 0 ; mov rax, ASM_PFX(CommonInterruptEntry) + 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 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 ;------------------------------------------------------------------------------------- -- 2.17.1