commit cfe8a3fcf1649d1559426c0dab8704ff5480c932
author Manish V Badarkhe <manish.badarkhe@arm.com> Tue Jun 20 12:23:23 2023 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Tue Jun 20 12:23:23 2023 +0200
tree 89cd8f8a293beb3f08f1299d038b527238f6cac6
parent 20d973bd60bcabfb2b016ab14ba5069296262ca6
parent 62cc109a41827e2883cc21ce5ba917ab18ac3e47

Merge "fix: pass SMCCCv1.3 SVE hint to internal flags" into integration

bl31/aarch64/runtime_exceptions.S

diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
index 8bcf94e..851ac47 100644
--- a/bl31/aarch64/runtime_exceptions.S
+++ b/bl31/aarch64/runtime_exceptions.S
@@ -519,7 +519,8 @@
 	 * flags using the appropriate helper.
 	 */
 2:
-	bfi	x7, x0, #FUNCID_SVE_HINT_SHIFT, #FUNCID_SVE_HINT_MASK
+	and	x16, x0, #(FUNCID_SVE_HINT_MASK << FUNCID_SVE_HINT_SHIFT)
+	orr	x7, x7, x16
 	bic	x0, x0, #(FUNCID_SVE_HINT_MASK << FUNCID_SVE_HINT_SHIFT)
 
 	/* Get the unique owning entity number */