andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #687 from sandrine-bailleux-arm/sb/panic-handler 

Add WFI in platform's unexpected error handlers
This commit is contained in:
danh-arm 2016-08-19 15:31:36 +01:00 committed by GitHub
parent efc759ad82 8c9e1af0b5
commit 079e522d39
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plat/arm/board/fvp/fvp_err.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2015-2016, 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:
@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <arch_helpers.h>
#include <board_arm_def.h>
#include <debug.h>
#include <errno.h>
@ -61,5 +62,5 @@ void plat_error_handler(int err)
/* Loop until the watchdog resets the system */
for (;;)
;
wfi();
}

5
plat/arm/board/juno/juno_err.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2015-2016, 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:
@ -28,6 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <arch_helpers.h>
#include <errno.h>
#include <v2m_def.h>
@ -45,5 +46,5 @@ void plat_error_handler(int err)
/* Loop until the watchdog resets the system */
for (;;)
;
wfi();
}

2
plat/common/aarch64/platform_helpers.S
View File

@ -130,6 +130,7 @@ endfunc bl1_plat_prepare_exit
* -----------------------------------------------------
*/
func plat_error_handler
wfi
b plat_error_handler
endfunc plat_error_handler
@ -139,5 +140,6 @@ endfunc plat_error_handler
* -----------------------------------------------------
*/
func plat_panic_handler
wfi
b plat_panic_handler
endfunc plat_panic_handler