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

Merge pull request #424 from jcastillo-arm/jc/tf-issues/327 

IMF: postpone SCR_EL3 update if context is not initialized
This commit is contained in:
Achin Gupta 2015-11-10 13:46:00 +00:00
parent 4266228306 5c943f7f4d
commit 613b7e5e7e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bl31/interrupt_mgmt.c
View File

@ -129,7 +129,12 @@ static void set_scr_el3_from_rm(uint32_t type,
flag = get_interrupt_rm_flag(interrupt_type_flags, security_state);
bit_pos = plat_interrupt_type_to_line(type, security_state);
intr_type_descs[type].scr_el3[security_state] = flag << bit_pos;
cm_write_scr_el3_bit(security_state, bit_pos, flag);
/* Update scr_el3 only if there is a context available. If not, it
* will be updated later during context initialization which will obtain
* the scr_el3 value to be used via get_scr_el3_from_routing_model() */
if (cm_get_context(security_state))
cm_write_scr_el3_bit(security_state, bit_pos, flag);
}
/*******************************************************************************