commit 3ca26bed7e22b22eb087c54a2a2dea8fdd313d68
author Sandrine Bailleux <sandrine.bailleux@arm.com> Thu Mar 14 11:38:01 2019 +0100
committer Sandrine Bailleux <sandrine.bailleux@arm.com> Thu Mar 14 13:57:16 2019 +0100
tree 4a25472a3dcc2b30e6746538b3aa64712a60c9ad
parent 620d9832f96ffcaf86d38b703ca913438d6eea7c

Fix restoring APIBKey registers

Instruction key A was incorrectly restored in the instruction key B
registers.

Change-Id: I4cb81ac72180442c077898509cb696c9d992eda3
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>

lib/el3_runtime/aarch64/context.S

diff --git a/lib/el3_runtime/aarch64/context.S b/lib/el3_runtime/aarch64/context.S
index 4371cb2..e6ab19b 100644
--- a/lib/el3_runtime/aarch64/context.S
+++ b/lib/el3_runtime/aarch64/context.S
@@ -356,7 +356,7 @@
 	msr	APIAKeyLo_EL1, x9
 	msr	APIAKeyHi_EL1, x10
 
-	ldp	x9, x10, [x11, #CTX_PACIAKEY_LO]
+	ldp	x9, x10, [x11, #CTX_PACIBKEY_LO]
 	msr	APIBKeyLo_EL1, x9
 	msr	APIBKeyHi_EL1, x10