From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=OQRge8d4; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.93.53, mailfrom: thomas.lendacky@amd.com) 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 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=LijOWzWFZmTUJyrXWatr2ub7vGJ+M3NwrWHnYsGCuaw=; b=OQRge8d44CWBJDzjOYkNkn7CR1SckybmEXNkCp48b96lpfJum96k0e13WvYi//xIyGyv4VAznuHIiApdJF01sg5D9ODJAvu6Cr9qLAIQ0u/PPI/Fy+0UsdIJz6YuIyegjU96/jQ9svs8XsBt+nHDIQiUh6tYpjxb9rIgBiVxgVs= 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 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 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: [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> X-Mailer: git-send-email 2.17.1 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) 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 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-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: 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-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; 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-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)(366004)(136003)(39860400002)(396003)(376002)(346002)(33430700001)(33440700001)(86362001)(83320400001)(478600001)(4326008)(6666004)(66946007)(83300400001)(316002)(83310400001)(83280400001)(83290400001)(54906003)(36756003)(966005)(2616005)(956004)(7416002)(45080400002)(7696005)(26005)(6916009)(2906002)(5660300002)(52116002)(16526019)(6486002)(8936002)(8676002)(19627235002)(66556008)(66476007)(186003)(136400200001);DIR:OUT;SFP:1101; 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 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 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/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