From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF188C433F5 for ; Thu, 10 Mar 2022 20:54:44 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2919883B8E; Thu, 10 Mar 2022 21:53:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="UqZTt7nc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E11F83AFC; Thu, 10 Mar 2022 21:52:08 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0619.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::619]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BE9C283AF2 for ; Thu, 10 Mar 2022 21:51:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OruCkKE/w15USYTWxUudr6G9Rv9z1KQV3GrsxJe5XEIHaq+NGYM+hcWWh3kVNg1EOf54eEjsqJCjGlQsvLKN3JKq95yH54AaWMXlpWjidTD9P928mAsk7cHEjyHirl16M7xiC9mkhvReSAA6ruFybdcs4e6Y1PlLBs/9pWxmWvgFRSvmoX4JSkVAqZt7XF+dnHZ671SB/uGg3TQ+Z2T8Hy6Hlz+duvXrtdMFHqg2c3OuCVPe3Dnx2RUULwQXOABbRyd6m1h0pQrzEFKUmezeSlknIHz2Jw8Cme/cpjDqgYxUTmCQmkm2YmFYcMGCJoE8sWwPMHyOyq2FDYp+NWpHlA== 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=aECBj2Q6lzS7vk+VGNaGj6wzi7A1bn7BIBIseSYHl7o=; b=Ve7FOavreFiESfhVRRIpYaCWoBaKqh06LEm4GlmassZ6vDP5K0u0ul2FeU+FBF0EesSVJZ6cC+KVrljEiznoHNiX7ZpxQKs8cSJbx5rRG1r//uxML45gfbMpwGT0+PFTSFR/qeVEtXkGpcUbi8B+lLoI+pxVOYSMhYmYoljwKo025Bpn6gU9PvN/qiyqNSgiDRJmsrSFJ9EdtdEJTxwyNWdTNs0MyJUiZagR2lpwIRLFV7gV95b2QgELt5PELAdEdi9ehYD8b6qjeA/JEIYoGgcIDm8RevvN/VPCA5yDNjRmHfPfu+OrJY1E2wV2cEadMu3XSOv86YRldACcTT+VbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aECBj2Q6lzS7vk+VGNaGj6wzi7A1bn7BIBIseSYHl7o=; b=UqZTt7ncfi/xuohJ8CnZZnPTY8jCnvwvm15f6PrLYNVBinTOF277d/qgSZ29wFmHhgHmqFHECpH1owtP/MdFyAHIC98zYQ/Ox1UyEHRiBNch+ZXkWHf97BD+tYybC9olNU1pvKiKk0y795HP3R47NY0yX3+D94BuvIh9S7ZTxBJ/3ll89kGA8SHkzOVDQQIVfKmQIMBlJOBl+su+df1k9eo2Y72xbWRPhPAXns9+gM/6WjCMngvQkXMwKPFMwneVpvAnQP9O7Jnavk/nmamnYmpv3V4tV84XnohtlZiNtg32uquNPVLpPD2fkmbAVmjymtyU0RDu3ugGcFyfYukL4w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by DB6PR0301MB2439.eurprd03.prod.outlook.com (2603:10a6:4:5b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14; Thu, 10 Mar 2022 20:51:43 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9860:b15b:f166:5896]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9860:b15b:f166:5896%3]) with mapi id 15.20.5061.022; Thu, 10 Mar 2022 20:51:43 +0000 From: Sean Anderson To: Tom Rini Cc: Liviu Dudau , u-boot@lists.denx.de, Simon Glass , Linus Walleij , Andre Przywara , Sean Anderson Subject: [PATCH v2 19/28] arm64: Save esr in pt_regs Date: Thu, 10 Mar 2022 15:50:49 -0500 Message-Id: <20220310205059.499269-20-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220310205059.499269-1-sean.anderson@seco.com> References: <20220310205059.499269-1-sean.anderson@seco.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BL1PR13CA0433.namprd13.prod.outlook.com (2603:10b6:208:2c3::18) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ef6abcd-a770-44af-05f4-08da02d7c867 X-MS-TrafficTypeDiagnostic: DB6PR0301MB2439: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: Lfn60XMi4rG50S1ztM3yiK1lfyQgnAjmmI5XALaJxeW3pYff4C7voc7uatvhGHeKEXXNA/lStrKjXqGBl8ijiuYOS7VSluqnBg8mmbhMZWAbiCqlxq7hPcBN7otII94d7DUGA5LFmQAyDKIdjnMmuky1xpVNbfGoVzjz/dpfs0CE33QQ0oiZk1bjhH2WHedbvhC0pnYo1eFCb3mGDnB0ueZ1y8sWiPE2rrKGcC87H5M+U9py4n5mPO3xabOIrgfB/hENnBqU8ow1/GoCVyNDBGQpHtKp/34oHV7amY2w0mNZJfCidYSXwpVZ7E328XTX/AZyQ6pAXVRXd1yYtJmvgvqrQHVeG7PKJO4nRugpioRgqGVEWVUdnUxXiq9H0BHSPVkV5VdqMaVzBvXx/zGZk8NgjbaANmtHed5qnSbJn+s0ZhX/zWgEk4z+StsO32cinEs5OamUUUQL3seAQ2cLkAt5wwllO41Vo0jMMtQo6nTz5HwTNq+mwwVNt3xSDuczcyNnfzTcLIgCUMdgHPIl2Kk4Z1BJRVCOJ5OIjOXeGC6LmLIM8fkEQKprBXatT60N1ZytENc/4k62pyFIH/oBDUIJFyFE5EVs8vZwj4QkJ14vdTRNpb3X4BSUnNwLQ2EWicSY4h/kiiR6r2X0naeQGgn3ToVEY85Zx9fQWIfuUBdivDTiM0j6vdZtKTje98CG7TfDgCoxBgPZ6isaZvQBuA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(54906003)(66476007)(316002)(4326008)(66556008)(6916009)(8676002)(66946007)(44832011)(36756003)(86362001)(2906002)(38350700002)(38100700002)(5660300002)(8936002)(6512007)(52116002)(6486002)(6506007)(508600001)(186003)(26005)(2616005)(107886003)(1076003)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1U5PmolBVHPkUTEfe6PL8Gwz7F+fOt3w8WplpgLTB5iaOgO+SEqB1T6Ez/JV?= =?us-ascii?Q?H0TPPLseLPSXVoo24NRKxM5ux15l+CRt32aPWwknzskMEHwi6ea+t9hxtHo9?= =?us-ascii?Q?1ptOSn3bQ1cbpEzdfUPqtF+obUdy5cnvqgWPCP8FgIYY+Cr/4qlLnP2g5Y1y?= =?us-ascii?Q?ILbFZjXRqBrDAv9JGzKaahh7ZgyrzUIwcxCZO5dbCqvNKaQL51kblk7NrBvK?= =?us-ascii?Q?HrfZm7bsa0xeBXa8EDsnQ4Zxz2DUO4a804kKaq8x3sSw92IIZWUN6M/PzvGc?= =?us-ascii?Q?em0Q1S+/7z3p1LPlGNuaO2BOZ/E/3DaPyk/cnbW9pLrgtQyF8FMkz5Yr9m0u?= =?us-ascii?Q?fQIKd0r4bMaKAOFHAMPt/zoPRdsTnnWllvGeft+ra8NCyNhc3HFKUle3O8Ku?= =?us-ascii?Q?quzxyhXSjmK0EItEzIx/SFAILptOb14XZri78+KjrsWBgfaWNuIvmK+UHciC?= =?us-ascii?Q?cO9JW22CxevZAACE4Wq5ysAUqPb2tByVZ6fYRsXT+kjo5vWSgk+XlIRHC7wI?= =?us-ascii?Q?JLAf4/+ylKJoaxdeQ7ZODBy0HsXmXAT216GPc2+m3U2upheZA6Zf2YK3HSw4?= =?us-ascii?Q?HqHhfxgWVUzIdNBn52ndohC2mvITQFBPmxoEM7CjKZLmv38bd3jOkaYl5lAP?= =?us-ascii?Q?yY9IX1S3RbUIxKmtwfyGWr80MK3f5kUJd55hCLA0M0uXvXyrMhkeJKBJ+k8J?= =?us-ascii?Q?mfK6qaJoLmEJXzQZ+FJCs31nQbwoXD020WG7YDwuveKiaE8a1Rx8vM3+8/nc?= =?us-ascii?Q?Y9D/v+xMz4idMxCbeq3plvgS9/BfV4tbT3ecWsRny5ch41YOFULHQ6MbLs1x?= =?us-ascii?Q?LcMJus/TpE1w69R/Kg96ipQ1XKCaTWVUD7dxLo4Rfh6rlcv6VZhOkQLmZE63?= =?us-ascii?Q?D+G8i3oaL6KRxTHLdFek6wq7vA8xZRYRlyQqpJYNQgaBxu8wEDKNw74DLHBI?= =?us-ascii?Q?ycufdn8VSSUXX0BK7BXWBfuKdjC61o9tKDjqV3NgTgvETX32gq0aGf5FsxMH?= =?us-ascii?Q?eN6S2rp31+OszzaofQXP43TATZu9EYiORNAzDES+dcchI1kaLqiWchoEA9g9?= =?us-ascii?Q?e6ro2ZkSNaD14UyJsZBV61j0NWQ+zBTa08iR3lkB071Lexm7+9fZPyCO8cAB?= =?us-ascii?Q?C+DsqTGA6fv5wHW+aovMfbkTlyOPFmnCouwLKKafQxYJ4yWjq/SSaWtADqlN?= =?us-ascii?Q?+i3cMrvNHtdlYdvlydnJLr3gBcUavH375+g7sbSjs69GNAws8PCM73hoMJ9p?= =?us-ascii?Q?wh2/1SmBBeN/Eh1Bs+xS3/A4/qaYwP5TAFQ6P3o4D8hsNXNT0VjOnTC+uHSw?= =?us-ascii?Q?hzB+Tp4Hkb4VwaOelpj90nF+gG/RW9yI5zqA4a0wkq36wewgtOJtwvMelz1k?= =?us-ascii?Q?iUWAdKI3kdvJZRQA1OktvLliyhNjRopPvovgo+eTtvxnnkmjEyhkcXeusvDX?= =?us-ascii?Q?zd4Pb4A4l4iU5dnfEUpFtlwMx/5GSs4x/1jx+/RUnPnmLqOJjDOMLlVwRZqz?= =?us-ascii?Q?HR9Pt2Ahy4TjuCVeMDQPkEL0M2BvBn2lR514KvG7DsGxVo+h+U/K6H9onmF5?= =?us-ascii?Q?IP169Jy+e7/66jIb+YWy9DpZ3pPjmEMUhlIl8dtOHUPKdr4DVneaAFiQdy1H?= =?us-ascii?Q?RcfHIv52Vm/wPVvmKRRcrvo=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ef6abcd-a770-44af-05f4-08da02d7c867 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2022 20:51:43.1640 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: j7Pcdm13UG6rOSY801c647/F04Km/XJ48W3P6+KfTz1GEU+I32ns8W5GlqVklF0gaPoTMPLiNcDzejzohpHCpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0301MB2439 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean To avoid passing around an extra register everywhere, save esr in pt_regs like the rest. For proper alignment we need to have a second (unused) register. All the printfs have to be adjusted, since it's now an unsigned long and not an int. Signed-off-by: Sean Anderson --- Changes in v2: - New arch/arm/cpu/armv8/exceptions.S | 6 +++-- arch/arm/include/asm/proc-armv/ptrace.h | 2 ++ arch/arm/include/asm/u-boot-arm.h | 7 +----- arch/arm/lib/interrupts_64.c | 33 +++++++++++++------------ arch/arm/mach-imx/imx8m/soc.c | 4 +-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm/cpu/armv8/exceptions.S b/arch/arm/cpu/armv8/exceptions.S index a15af72e02..001913f429 100644 --- a/arch/arm/cpu/armv8/exceptions.S +++ b/arch/arm/cpu/armv8/exceptions.S @@ -84,7 +84,8 @@ _save_el_regs: 1: mrs x1, esr_el1 mrs x2, elr_el1 0: - stp x2, x0, [sp, #-16]! + stp x1, x0, [sp, #-16]! + stp xzr, x2, [sp, #-16]! mov x0, sp ret @@ -98,7 +99,7 @@ _save_el_regs: * This is the first part of the shared routine called into from all entries. */ exception_exit: - ldp x2, x0, [sp],#16 + ldp xzr, x2, [sp],#16 switch_el x11, 3f, 2f, 1f 3: msr elr_el3, x2 b _restore_regs @@ -118,6 +119,7 @@ exception_exit: * This is the second part of the shared routine called into from all entries. */ _restore_regs: + ldp xzr, x0, [sp],#16 ldp x1, x2, [sp],#16 ldp x3, x4, [sp],#16 ldp x5, x6, [sp],#16 diff --git a/arch/arm/include/asm/proc-armv/ptrace.h b/arch/arm/include/asm/proc-armv/ptrace.h index e37ad8fd1f..bebcaf6e33 100644 --- a/arch/arm/include/asm/proc-armv/ptrace.h +++ b/arch/arm/include/asm/proc-armv/ptrace.h @@ -21,7 +21,9 @@ * on the stack during an exception. */ struct pt_regs { + unsigned long unused; unsigned long elr; + unsigned long esr; unsigned long regs[31]; }; diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h index 0b93cc48c5..aef048708d 100644 --- a/arch/arm/include/asm/u-boot-arm.h +++ b/arch/arm/include/asm/u-boot-arm.h @@ -46,13 +46,8 @@ void do_software_interrupt(struct pt_regs *pt_regs); void do_prefetch_abort(struct pt_regs *pt_regs); void do_data_abort(struct pt_regs *pt_regs); void do_not_used(struct pt_regs *pt_regs); -#ifdef CONFIG_ARM64 -void do_fiq(struct pt_regs *pt_regs, unsigned int esr); -void do_irq(struct pt_regs *pt_regs, unsigned int esr); -#else void do_fiq(struct pt_regs *pt_regs); -void do_irq(struct pt_regs *pt_regswq); -#endif +void do_irq(struct pt_regs *pt_regs); void reset_misc(void); diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c index c653e67db2..049beeca7e 100644 --- a/arch/arm/lib/interrupts_64.c +++ b/arch/arm/lib/interrupts_64.c @@ -66,10 +66,11 @@ void show_regs(struct pt_regs *regs) /* * do_bad_sync handles the impossible case in the Synchronous Abort vector. */ -void do_bad_sync(struct pt_regs *pt_regs, unsigned int esr) +void do_bad_sync(struct pt_regs *pt_regs) { efi_restore_gd(); - printf("Bad mode in \"Synchronous Abort\" handler, esr 0x%08x\n", esr); + printf("Bad mode in \"Synchronous Abort\" handler, esr 0x%08lx\n", + pt_regs->esr); show_regs(pt_regs); show_efi_loaded_images(pt_regs); panic("Resetting CPU ...\n"); @@ -78,10 +79,10 @@ void do_bad_sync(struct pt_regs *pt_regs, unsigned int esr) /* * do_bad_irq handles the impossible case in the Irq vector. */ -void do_bad_irq(struct pt_regs *pt_regs, unsigned int esr) +void do_bad_irq(struct pt_regs *pt_regs) { efi_restore_gd(); - printf("Bad mode in \"Irq\" handler, esr 0x%08x\n", esr); + printf("Bad mode in \"Irq\" handler, esr 0x%08lx\n", pt_regs->esr); show_regs(pt_regs); show_efi_loaded_images(pt_regs); panic("Resetting CPU ...\n"); @@ -90,10 +91,10 @@ void do_bad_irq(struct pt_regs *pt_regs, unsigned int esr) /* * do_bad_fiq handles the impossible case in the Fiq vector. */ -void do_bad_fiq(struct pt_regs *pt_regs, unsigned int esr) +void do_bad_fiq(struct pt_regs *pt_regs) { efi_restore_gd(); - printf("Bad mode in \"Fiq\" handler, esr 0x%08x\n", esr); + printf("Bad mode in \"Fiq\" handler, esr 0x%08lx\n", pt_regs->esr); show_regs(pt_regs); show_efi_loaded_images(pt_regs); panic("Resetting CPU ...\n"); @@ -102,10 +103,10 @@ void do_bad_fiq(struct pt_regs *pt_regs, unsigned int esr) /* * do_bad_error handles the impossible case in the Error vector. */ -void do_bad_error(struct pt_regs *pt_regs, unsigned int esr) +void do_bad_error(struct pt_regs *pt_regs) { efi_restore_gd(); - printf("Bad mode in \"Error\" handler, esr 0x%08x\n", esr); + printf("Bad mode in \"Error\" handler, esr 0x%08lx\n", pt_regs->esr); show_regs(pt_regs); show_efi_loaded_images(pt_regs); panic("Resetting CPU ...\n"); @@ -114,10 +115,10 @@ void do_bad_error(struct pt_regs *pt_regs, unsigned int esr) /* * do_sync handles the Synchronous Abort exception. */ -void do_sync(struct pt_regs *pt_regs, unsigned int esr) +void do_sync(struct pt_regs *pt_regs) { efi_restore_gd(); - printf("\"Synchronous Abort\" handler, esr 0x%08x\n", esr); + printf("\"Synchronous Abort\" handler, esr 0x%08lx\n", pt_regs->esr); show_regs(pt_regs); show_efi_loaded_images(pt_regs); panic("Resetting CPU ...\n"); @@ -126,10 +127,10 @@ void do_sync(struct pt_regs *pt_regs, unsigned int esr) /* * do_irq handles the Irq exception. */ -void do_irq(struct pt_regs *pt_regs, unsigned int esr) +void do_irq(struct pt_regs *pt_regs) { efi_restore_gd(); - printf("\"Irq\" handler, esr 0x%08x\n", esr); + printf("\"Irq\" handler, esr 0x%08lx\n", pt_regs->esr); show_regs(pt_regs); show_efi_loaded_images(pt_regs); panic("Resetting CPU ...\n"); @@ -138,10 +139,10 @@ void do_irq(struct pt_regs *pt_regs, unsigned int esr) /* * do_fiq handles the Fiq exception. */ -void do_fiq(struct pt_regs *pt_regs, unsigned int esr) +void do_fiq(struct pt_regs *pt_regs) { efi_restore_gd(); - printf("\"Fiq\" handler, esr 0x%08x\n", esr); + printf("\"Fiq\" handler, esr 0x%08lx\n", pt_regs->esr); show_regs(pt_regs); show_efi_loaded_images(pt_regs); panic("Resetting CPU ...\n"); @@ -153,10 +154,10 @@ void do_fiq(struct pt_regs *pt_regs, unsigned int esr) * it is defined with weak attribute and can be redefined * in processor specific code. */ -void __weak do_error(struct pt_regs *pt_regs, unsigned int esr) +void __weak do_error(struct pt_regs *pt_regs) { efi_restore_gd(); - printf("\"Error\" handler, esr 0x%08x\n", esr); + printf("\"Error\" handler, esr 0x%08lx\n", pt_regs->esr); show_regs(pt_regs); show_efi_loaded_images(pt_regs); panic("Resetting CPU ...\n"); diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 1a5a391443..06d9f7128d 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1293,7 +1293,7 @@ void imx_tmu_arch_init(void *reg_base) #if defined(CONFIG_IMX8MQ) || defined(CONFIG_IMX8MM) || defined(CONFIG_IMX8MN) bool serror_need_skip = true; -void do_error(struct pt_regs *pt_regs, unsigned int esr) +void do_error(struct pt_regs *pt_regs) { /* * If stack is still in ROM reserved OCRAM not switch to SPL, @@ -1318,7 +1318,7 @@ void do_error(struct pt_regs *pt_regs, unsigned int esr) } efi_restore_gd(); - printf("\"Error\" handler, esr 0x%08x\n", esr); + printf("\"Error\" handler, esr 0x%08lx\n", pt_regs->esr); show_regs(pt_regs); panic("Resetting CPU ...\n"); } -- 2.25.1