aboutsummaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorDan Handley <dan.handley@arm.com>2014-08-19 11:04:21 +0100
committerDan Handley <dan.handley@arm.com>2014-08-19 11:04:21 +0100
commita1d80440c44ce70e5fec4d8c60b5f6688b6cf8ff (patch)
tree27877c106f03eed314f529ee05e66cb747e1914b /services
parent57a18ff489fcfba38f26845eafacd90479c0be81 (diff)
parent0c8d4fef28768233f1f46b4d085f904293dffd2c (diff)
Merge pull request #189 from achingupta/ag/tf-issues#153
Unmask SError interrupt and clear SCR_EL3.EA bit
Diffstat (limited to 'services')
-rw-r--r--services/std_svc/psci/psci_entry.S7
1 files changed, 7 insertions, 0 deletions
diff --git a/services/std_svc/psci/psci_entry.S b/services/std_svc/psci/psci_entry.S
index e9ad130..68b917e 100644
--- a/services/std_svc/psci/psci_entry.S
+++ b/services/std_svc/psci/psci_entry.S
@@ -88,6 +88,13 @@ psci_aff_common_finish_entry:
isb
/* ---------------------------------------------
+ * Enable the SError interrupt now that the
+ * exception vectors have been setup.
+ * ---------------------------------------------
+ */
+ msr daifclr, #DAIF_ABT_BIT
+
+ /* ---------------------------------------------
* Use SP_EL0 for the C runtime stack.
* ---------------------------------------------
*/