Merge pull request #83 from athoelke:at/tf-issues-126

b9c4d540 · Andrew Thoelke · f4d58669 · bb5ffdba · b9c4d540
Commit b9c4d540 authored 10 years ago by Andrew Thoelke
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 0 deletions
+6 -0
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -169,9 +169,15 @@ void bl31_prepare_next_image_entry()
 	assert(next_image_info);

 	scr = read_scr();
+	scr &= ~SCR_NS_BIT;
 	if (image_type == NON_SECURE)
 		scr |= SCR_NS_BIT;

+	scr &= ~SCR_RW_BIT;
+	if ((next_image_info->spsr & (1 << MODE_RW_SHIFT)) ==
+				(MODE_RW_64 << MODE_RW_SHIFT))
+		scr |= SCR_RW_BIT;
+
 	/*
 	 * Tell the context mgmt. library to ensure that SP_EL3 points to
 	 * the right context to exit from EL3 correctly.