|
@@ -18,6 +18,7 @@
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
*/
|
|
|
|
|
|
+#include <linux/arm-smccc.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/linkage.h>
|
|
|
|
|
@@ -137,6 +138,18 @@ alternative_else_nop_endif
|
|
|
add \dst, \dst, #(\sym - .entry.tramp.text)
|
|
|
.endm
|
|
|
|
|
|
+ // This macro corrupts x0-x3. It is the caller's duty
|
|
|
+ // to save/restore them if required.
|
|
|
+ .macro apply_ssbd, state
|
|
|
+#ifdef CONFIG_ARM64_SSBD
|
|
|
+ mov w0, #ARM_SMCCC_ARCH_WORKAROUND_2
|
|
|
+ mov w1, #\state
|
|
|
+alternative_cb arm64_update_smccc_conduit
|
|
|
+ nop // Patched to SMC/HVC #0
|
|
|
+alternative_cb_end
|
|
|
+#endif
|
|
|
+ .endm
|
|
|
+
|
|
|
.macro kernel_entry, el, regsize = 64
|
|
|
.if \regsize == 32
|
|
|
mov w0, w0 // zero upper 32 bits of x0
|
|
@@ -163,6 +176,13 @@ alternative_else_nop_endif
|
|
|
ldr x19, [tsk, #TSK_TI_FLAGS] // since we can unmask debug
|
|
|
disable_step_tsk x19, x20 // exceptions when scheduling.
|
|
|
|
|
|
+ apply_ssbd 1
|
|
|
+
|
|
|
+#ifdef CONFIG_ARM64_SSBD
|
|
|
+ ldp x0, x1, [sp, #16 * 0]
|
|
|
+ ldp x2, x3, [sp, #16 * 1]
|
|
|
+#endif
|
|
|
+
|
|
|
mov x29, xzr // fp pointed to user-space
|
|
|
.else
|
|
|
add x21, sp, #S_FRAME_SIZE
|
|
@@ -303,6 +323,8 @@ alternative_if ARM64_WORKAROUND_845719
|
|
|
alternative_else_nop_endif
|
|
|
#endif
|
|
|
3:
|
|
|
+ apply_ssbd 0
|
|
|
+
|
|
|
.endif
|
|
|
|
|
|
msr elr_el1, x21 // set up the return data
|