移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/arch/arm/kernel/entry-common.S
..
..
@@ -1,11 +1,8 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /*
2
3
  *  linux/arch/arm/kernel/entry-common.S
3
4
  *
4
5
  *  Copyright (C) 2000 Russell King
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License version 2 as
8
- * published by the Free Software Foundation.
9
6
  */
10
7
 
11
8
 #include <asm/assembler.h>
..
..
@@ -56,7 +53,7 @@
56
53
 	cmp	r2, #TASK_SIZE
57
54
 	blne	addr_limit_check_failed
58
55
 	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing
59
-	tst	r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
56
+	movs	r1, r1, lsl #16
60
57
 	bne	fast_work_pending
61
58
 
62
59
 
..
..
@@ -93,8 +90,9 @@
93
90
 	cmp	r2, #TASK_SIZE
94
91
 	blne	addr_limit_check_failed
95
92
 	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing
96
-	tst	r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
93
+	movs	r1, r1, lsl #16
97
94
 	beq	no_work_pending
95
+do_slower_path:
98
96
  UNWIND(.fnend		)
99
97
 ENDPROC(ret_fast_syscall)
100
98
 
..
..
@@ -134,7 +132,7 @@
134
132
 	cmp	r2, #TASK_SIZE
135
133
 	blne	addr_limit_check_failed
136
134
 	ldr	r1, [tsk, #TI_FLAGS]
137
-	tst	r1, #_TIF_WORK_MASK
135
+	movs	r1, r1, lsl #16
138
136
 	bne	slow_work_pending
139
137
 no_work_pending:
140
138
 	asm_trace_hardirqs_on save = 0
..
..
@@ -166,12 +164,36 @@
166
164
  */
167
165
 
168
166
 	.align	5
167
+#ifdef CONFIG_HARDEN_BRANCH_HISTORY
168
+ENTRY(vector_bhb_loop8_swi)
169
+	sub	sp, sp, #PT_REGS_SIZE
170
+	stmia	sp, {r0 - r12}
171
+	mov	r8, #8
172
+1:	b	2f
173
+2:	subs	r8, r8, #1
174
+	bne	1b
175
+	dsb
176
+	isb
177
+	b	3f
178
+ENDPROC(vector_bhb_loop8_swi)
179
+
180
+	.align	5
181
+ENTRY(vector_bhb_bpiall_swi)
182
+	sub	sp, sp, #PT_REGS_SIZE
183
+	stmia	sp, {r0 - r12}
184
+	mcr	p15, 0, r8, c7, c5, 6	@ BPIALL
185
+	isb
186
+	b	3f
187
+ENDPROC(vector_bhb_bpiall_swi)
188
+#endif
189
+	.align	5
169
190
 ENTRY(vector_swi)
170
191
 #ifdef CONFIG_CPU_V7M
171
192
 	v7m_exception_entry
172
193
 #else
173
194
 	sub	sp, sp, #PT_REGS_SIZE
174
195
 	stmia	sp, {r0 - r12}			@ Calling r0 - r12
196
+3:
175
197
  ARM(	add	r8, sp, #S_PC		)
176
198
  ARM(	stmdb	r8, {sp, lr}^		)	@ Calling sp, lr
177
199
  THUMB(	mov	r8, sp			)
..
..
@@ -373,7 +395,7 @@
373
395
 		movhs	scno, #0
374
396
 		csdb
375
397
 #endif
376
-		stmloia	sp, {r5, r6}		@ shuffle args
398
+		stmialo	sp, {r5, r6}		@ shuffle args
377
399
 		movlo	r0, r1
378
400
 		movlo	r1, r2
379
401
 		movlo	r2, r3