Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-29 16:48:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

utils_def: Add REGSZ and make BIT() assembly-compatible

Browse source 
In assembly code it can be useful to have a constant for the width of a
register in the current architecture, so this patch adds one to
<utils_def.h> and replaces the existing custom one in crash_reporting.S
with that. It also fixes up the BIT() macro in the same file so that it
can be safely used in assembly code.

Change-Id: I10513a311f3379e767396e6ddfbae8d2d8201464
Signed-off-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Julius Werner 2017-12-12 14:23:26 -08:00
parent 211d307c6b
commit 155a10068a
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
bl31/aarch64/crash_reporting.S
View file

@ -9,13 +9,13 @@
#include <cpu_data.h> #include <cpu_data.h>
#include <plat_macros.S> #include <plat_macros.S>
#include <platform_def.h> #include <platform_def.h>
#include <utils_def.h>
.globl report_unhandled_exception .globl report_unhandled_exception
.globl report_unhandled_interrupt .globl report_unhandled_interrupt
.globl el3_panic .globl el3_panic
#if CRASH_REPORTING #if CRASH_REPORTING
#define REG_SIZE 0x8
/* ------------------------------------------------------ /* ------------------------------------------------------
* The below section deals with dumping the system state * The below section deals with dumping the system state
@ -92,7 +92,7 @@ test_size_list:
mov x6, x4 mov x6, x4
adr x4, print_spacer adr x4, print_spacer
bl asm_print_str bl asm_print_str
ldr x4, [x7], #REG_SIZE ldr x4, [x7], #REGSZ
bl asm_print_hex bl asm_print_hex
bl print_newline bl print_newline
b test_size_list b test_size_list
@ -114,9 +114,9 @@ func str_in_crash_buf_print
/* restore the crash buf address in x0 */ /* restore the crash buf address in x0 */
mrs x0, tpidr_el3 mrs x0, tpidr_el3
stp x8, x9, [x0] stp x8, x9, [x0]
stp x10, x11, [x0, #REG_SIZE * 2] stp x10, x11, [x0, #REGSZ * 2]
stp x12, x13, [x0, #REG_SIZE * 4] stp x12, x13, [x0, #REGSZ * 4]
stp x14, x15, [x0, #REG_SIZE * 6] stp x14, x15, [x0, #REGSZ * 6]
b size_controlled_print b size_controlled_print
endfunc str_in_crash_buf_print endfunc str_in_crash_buf_print
@ -136,7 +136,7 @@ endfunc str_in_crash_buf_print
add x0, x0, #CPU_DATA_CRASH_BUF_OFFSET add x0, x0, #CPU_DATA_CRASH_BUF_OFFSET
/* Store crash buffer address in tpidr_el3 */ /* Store crash buffer address in tpidr_el3 */
msr tpidr_el3, x0 msr tpidr_el3, x0
str x1, [x0, #REG_SIZE] str x1, [x0, #REGSZ]
mov x1, sp mov x1, sp
str x1, [x0] str x1, [x0]
.endm .endm
@ -214,9 +214,9 @@ func do_crash_reporting
/* Retrieve the crash buf from tpidr_el3 */ /* Retrieve the crash buf from tpidr_el3 */
mrs x0, tpidr_el3 mrs x0, tpidr_el3
/* Store x2 - x6, x30 in the crash buffer */ /* Store x2 - x6, x30 in the crash buffer */
stp x2, x3, [x0, #REG_SIZE * 2] stp x2, x3, [x0, #REGSZ * 2]
stp x4, x5, [x0, #REG_SIZE * 4] stp x4, x5, [x0, #REGSZ * 4]
stp x6, x30, [x0, #REG_SIZE * 6] stp x6, x30, [x0, #REGSZ * 6]
/* Initialize the crash console */ /* Initialize the crash console */
bl plat_crash_console_init bl plat_crash_console_init
/* Verify the console is initialized */ /* Verify the console is initialized */
@ -227,13 +227,13 @@ func do_crash_reporting
/* load the crash buf address */ /* load the crash buf address */
mrs x0, tpidr_el3 mrs x0, tpidr_el3
/* report x30 first from the crash buf */ /* report x30 first from the crash buf */
ldr x4, [x0, #REG_SIZE * 7] ldr x4, [x0, #REGSZ * 7]
bl asm_print_hex bl asm_print_hex
bl print_newline bl print_newline
/* Load the crash buf address */ /* Load the crash buf address */
mrs x0, tpidr_el3 mrs x0, tpidr_el3
/* Now mov x7 into crash buf */ /* Now mov x7 into crash buf */
str x7, [x0, #REG_SIZE * 7] str x7, [x0, #REGSZ * 7]
/* Report x0 - x29 values stored in crash buf*/ /* Report x0 - x29 values stored in crash buf*/
/* Store the ascii list pointer in x6 */ /* Store the ascii list pointer in x6 */
@ -246,15 +246,15 @@ func do_crash_reporting
mrs x0, tpidr_el3 mrs x0, tpidr_el3
/* Store the rest of gp regs and print */ /* Store the rest of gp regs and print */
stp x16, x17, [x0] stp x16, x17, [x0]
stp x18, x19, [x0, #REG_SIZE * 2] stp x18, x19, [x0, #REGSZ * 2]
stp x20, x21, [x0, #REG_SIZE * 4] stp x20, x21, [x0, #REGSZ * 4]
stp x22, x23, [x0, #REG_SIZE * 6] stp x22, x23, [x0, #REGSZ * 6]
bl size_controlled_print bl size_controlled_print
/* Load the crash buf address */ /* Load the crash buf address */
mrs x0, tpidr_el3 mrs x0, tpidr_el3
stp x24, x25, [x0] stp x24, x25, [x0]
stp x26, x27, [x0, #REG_SIZE * 2] stp x26, x27, [x0, #REGSZ * 2]
stp x28, x29, [x0, #REG_SIZE * 4] stp x28, x29, [x0, #REGSZ * 4]
bl size_controlled_print bl size_controlled_print
/* Print the el3 sys registers */ /* Print the el3 sys registers */

9
include/lib/utils_def.h
View file

@ -16,7 +16,7 @@
#define SIZE_FROM_LOG2_WORDS(n) (4 << (n)) #define SIZE_FROM_LOG2_WORDS(n) (4 << (n))
#define BIT(nr) (1ULL << (nr)) #define BIT(nr) (ULL(1) << (nr))
/* /*
* This variant of div_round_up can be used in macro definition but should not * This variant of div_round_up can be used in macro definition but should not
@ -84,6 +84,13 @@
# define ULL(_x) (_x##ull) # define ULL(_x) (_x##ull)
#endif #endif
/* Register size of the current architecture. */
#ifdef AARCH32
#define REGSZ U(4)
#else
#define REGSZ U(8)
#endif
/* /*
* Test for the current architecture version to be at least the version * Test for the current architecture version to be at least the version
* expected. * expected.