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

Merge "fix(misra): fix MISRA defects" into integration

Browse source
This commit is contained in:
Manish Pandey 2024-03-07 21:56:03 +01:00 • committed by TrustedFirmware Code Review
commit fba343b0b1
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bl31/bl31_main.c
View file

@ -83,7 +83,7 @@ uintptr_t get_arm_std_svc_args(unsigned int svc_mask)
/******************************************************************************* /*******************************************************************************
* Simple function to initialise all BL31 helper libraries. * Simple function to initialise all BL31 helper libraries.
******************************************************************************/ ******************************************************************************/
void __init bl31_lib_init(void) static void __init bl31_lib_init(void)
{ {
cm_init(); cm_init();
} }

2
bl31/interrupt_mgmt.c
View file

@ -34,7 +34,7 @@
* *
* All other bits are reserved and SBZ. * All other bits are reserved and SBZ.
******************************************************************************/ ******************************************************************************/
typedef struct intr_type_desc { typedef struct {
interrupt_type_handler_t handler; interrupt_type_handler_t handler;
u_register_t scr_el3[2]; u_register_t scr_el3[2];
uint32_t flags; uint32_t flags;

1
include/bl31/bl31.h
View file

@ -22,6 +22,5 @@ void bl31_register_bl32_init(int32_t (*func)(void));
void bl31_register_rmm_init(int32_t (*func)(void)); void bl31_register_rmm_init(int32_t (*func)(void));
void bl31_warm_entrypoint(void); void bl31_warm_entrypoint(void);
void bl31_main(void); void bl31_main(void);
void bl31_lib_init(void);
#endif /* BL31_H */ #endif /* BL31_H */

13
plat/common/aarch64/plat_common.c
View file

@ -72,12 +72,19 @@ int plat_sdei_validate_entry_point(uintptr_t ep, unsigned int client_mode)
const char *get_el_str(unsigned int el) const char *get_el_str(unsigned int el)
{ {
if (el == MODE_EL3) { switch (el) {
case MODE_EL3:
return "EL3"; return "EL3";
} else if (el == MODE_EL2) { case MODE_EL2:
return "EL2"; return "EL2";
case MODE_EL1:
return "EL1";
case MODE_EL0:
return "EL0";
default:
assert(false);
return NULL;
} }
return "EL1";
} }
#if FFH_SUPPORT #if FFH_SUPPORT