From 6fa11a5e99aac3eca9d1a02c99e09c5071a2e10c Mon Sep 17 00:00:00 2001 From: Soby Mathew Date: Mon, 13 Apr 2015 16:57:12 +0100 Subject: [PATCH] Fix recursive crash prints on FVP AEM model This patch fixes an issue in the cpu specific register reporting of FVP AEM model whereby crash reporting itself triggers an exception thus resulting in recursive crash prints. The input to the 'size_controlled_print' in the crash reporting framework should be a NULL terminated string. As there were no cpu specific register to be reported on FVP AEM model, the issue was caused by passing 0 instead of NULL terminated string to the above mentioned function. Change-Id: I664427b22b89977b389175dfde84c815f02c705a --- lib/cpus/aarch64/aem_generic.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/cpus/aarch64/aem_generic.S b/lib/cpus/aarch64/aem_generic.S index ee53058e..0ab5253e 100644 --- a/lib/cpus/aarch64/aem_generic.S +++ b/lib/cpus/aarch64/aem_generic.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2015, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -79,8 +79,12 @@ endfunc aem_generic_cluster_pwr_dwn * reported. * --------------------------------------------- */ +.section .rodata.aem_generic_regs, "aS" +aem_generic_regs: /* The ascii list of register names to be reported */ + .asciz "" /* no registers to report */ + func aem_generic_cpu_reg_dump - mov x6, #0 /* no registers to report */ + adr x6, aem_generic_regs ret endfunc aem_generic_cpu_reg_dump -- 2.30.2