Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
485d1f80
Commit
485d1f80
authored
3 years ago
by
Madhukar Pappireddy
Committed by
TrustedFirmware Code Review
3 years ago
Browse files
Options
Download
Plain Diff
Merge "refactor(plat/ea_handler): Use default ea handler implementation for panic" into integration
parents
be3a51ce
30e8fa7e
master
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
include/plat/common/platform.h
+2
-0
include/plat/common/platform.h
plat/common/aarch64/plat_common.c
+2
-2
plat/common/aarch64/plat_common.c
plat/marvell/armada/a3k/common/a3700_ea.c
+5
-7
plat/marvell/armada/a3k/common/a3700_ea.c
plat/nvidia/tegra/soc/t194/plat_ras.c
+1
-4
plat/nvidia/tegra/soc/t194/plat_ras.c
plat/renesas/common/rcar_common.c
+1
-5
plat/renesas/common/rcar_common.c
with
11 additions
and
18 deletions
+11
-18
include/plat/common/platform.h
View file @
485d1f80
...
...
@@ -141,6 +141,8 @@ int plat_sdei_validate_entry_point(uintptr_t ep, unsigned int client_mode);
void
plat_sdei_handle_masked_trigger
(
uint64_t
mpidr
,
unsigned
int
intr
);
#endif
void
plat_default_ea_handler
(
unsigned
int
ea_reason
,
uint64_t
syndrome
,
void
*
cookie
,
void
*
handle
,
uint64_t
flags
);
void
plat_ea_handler
(
unsigned
int
ea_reason
,
uint64_t
syndrome
,
void
*
cookie
,
void
*
handle
,
uint64_t
flags
);
...
...
This diff is collapsed.
Click to expand it.
plat/common/aarch64/plat_common.c
View file @
485d1f80
...
...
@@ -28,7 +28,7 @@
#pragma weak plat_sdei_validate_entry_point
#endif
#pragma weak plat_ea_handler
#pragma weak plat_ea_handler
= plat_default_ea_handler
void
bl31_plat_runtime_setup
(
void
)
{
...
...
@@ -79,7 +79,7 @@ static const char *get_el_str(unsigned int el)
#endif
/* !ENABLE_BACKTRACE */
/* RAS functions common to AArch64 ARM platforms */
void
plat_ea_handler
(
unsigned
int
ea_reason
,
uint64_t
syndrome
,
void
*
cookie
,
void
plat_
default_
ea_handler
(
unsigned
int
ea_reason
,
uint64_t
syndrome
,
void
*
cookie
,
void
*
handle
,
uint64_t
flags
)
{
#if RAS_EXTENSION
...
...
This diff is collapsed.
Click to expand it.
plat/marvell/armada/a3k/common/a3700_ea.c
View file @
485d1f80
...
...
@@ -7,17 +7,15 @@
#include <common/bl_common.h>
#include <common/debug.h>
#include <arch_helpers.h>
#include <plat/common/platform.h>
#define ADVK_SERROR_SYNDROME 0xbf000002
void
plat_ea_handler
(
unsigned
int
ea_reason
,
uint64_t
syndrome
,
void
*
cookie
,
void
*
handle
,
uint64_t
flags
)
{
if
(
syndrome
!=
ADVK_SERROR_SYNDROME
)
{
ERROR
(
"Unhandled External Abort received on 0x%lx at EL3!
\n
"
,
read_mpidr_el1
());
ERROR
(
" exception reason=%u syndrome=0x%llx
\n
"
,
ea_reason
,
syndrome
);
panic
();
}
if
(
syndrome
==
ADVK_SERROR_SYNDROME
)
return
;
plat_default_ea_handler
(
ea_reason
,
syndrome
,
cookie
,
handle
,
flags
);
}
This diff is collapsed.
Click to expand it.
plat/nvidia/tegra/soc/t194/plat_ras.c
View file @
485d1f80
...
...
@@ -493,9 +493,6 @@ void plat_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie,
#if RAS_EXTENSION
tegra194_ea_handler
(
ea_reason
,
syndrome
,
cookie
,
handle
,
flags
);
#else
ERROR
(
"Unhandled External Abort received on 0x%llx at EL3!
\n
"
,
read_mpidr_el1
());
ERROR
(
" exception reason=%u syndrome=0x%lx
\n
"
,
ea_reason
,
syndrome
);
panic
();
plat_default_ea_handler
(
ea_reason
,
syndrome
,
cookie
,
handle
,
flags
);
#endif
}
This diff is collapsed.
Click to expand it.
plat/renesas/common/rcar_common.c
View file @
485d1f80
...
...
@@ -60,11 +60,7 @@ void plat_ea_handler(unsigned int ea_reason, uint64_t syndrome, void *cookie,
if
(
fixed
)
return
;
ERROR
(
"Unhandled External Abort received on 0x%lx at EL3!
\n
"
,
read_mpidr_el1
());
ERROR
(
" exception reason=%u syndrome=0x%llx
\n
"
,
ea_reason
,
syndrome
);
panic
();
plat_default_ea_handler
(
ea_reason
,
syndrome
,
cookie
,
handle
,
flags
);
}
#include <drivers/renesas/rcar/console/console.h>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help