aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/imx8m/soc.c
diff options
context:
space:
mode:
authorSean Anderson <sean.anderson@seco.com>2022-03-22 17:17:35 -0400
committerTom Rini <trini@konsulko.com>2022-04-01 16:56:53 -0400
commite97ac4780d69c719b81086bba615c8568afd14a1 (patch)
tree6003aaab580f6181b363d20eb8c7c32bd1adabd7 /arch/arm/mach-imx/imx8m/soc.c
parent93c3d329707e0d8dc98e5f86938bbedbe15b5349 (diff)
downloadu-boot-e97ac4780d69c719b81086bba615c8568afd14a1.tar.gz
arm64: Save esr in pt_regs
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 <sean.anderson@seco.com>
Diffstat (limited to 'arch/arm/mach-imx/imx8m/soc.c')
-rw-r--r--arch/arm/mach-imx/imx8m/soc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 838f0a37496..7397b99a1ee 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -1295,7 +1295,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,
@@ -1320,7 +1320,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");
}