forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/arch/arm/kernel/entry-armv.S
....@@ -1,13 +1,10 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
12 /*
23  *  linux/arch/arm/kernel/entry-armv.S
34  *
45  *  Copyright (C) 1996,1997,1998 Russell King.
56  *  ARM700 fix by Matthew Godbolt (linux-user@willothewisp.demon.co.uk)
67  *  nommu support by Hyok S. Choi (hyok.choi@samsung.com)
7
- *
8
- * This program is free software; you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License version 2 as
10
- * published by the Free Software Foundation.
118  *
129  *  Low-level vector interface routines
1310  *
....@@ -207,7 +204,7 @@
207204 	svc_entry
208205 	irq_handler
209206 
210
-#ifdef CONFIG_PREEMPT
207
+#ifdef CONFIG_PREEMPTION
211208 	ldr	r8, [tsk, #TI_PREEMPT]		@ get preempt count
212209 	teq	r8, #0				@ if preempt count != 0
213210 	bne	1f				@ return from exeption
....@@ -229,7 +226,7 @@
229226 
230227 	.ltorg
231228 
232
-#ifdef CONFIG_PREEMPT
229
+#ifdef CONFIG_PREEMPTION
233230 svc_preempt:
234231 	mov	r8, lr
235232 1:	bl	preempt_schedule_irq		@ irq en/disable is done inside
....@@ -268,31 +265,10 @@
268265 #else
269266 	svc_entry
270267 #endif
271
-	@
272
-	@ call emulation code, which returns using r9 if it has emulated
273
-	@ the instruction, or the more conventional lr if we are to treat
274
-	@ this as a real undefined instruction
275
-	@
276
-	@  r0 - instruction
277
-	@
278
-#ifndef CONFIG_THUMB2_KERNEL
279
-	ldr	r0, [r4, #-4]
280
-#else
281
-	mov	r1, #2
282
-	ldrh	r0, [r4, #-2]			@ Thumb instruction at LR - 2
283
-	cmp	r0, #0xe800			@ 32-bit instruction if xx >= 0
284
-	blo	__und_svc_fault
285
-	ldrh	r9, [r4]			@ bottom 16 bits
286
-	add	r4, r4, #2
287
-	str	r4, [sp, #S_PC]
288
-	orr	r0, r9, r0, lsl #16
289
-#endif
290
-	badr	r9, __und_svc_finish
291
-	mov	r2, r4
292
-	bl	call_fpe
293268 
294269 	mov	r1, #4				@ PC correction to apply
295
-__und_svc_fault:
270
+ THUMB(	tst	r5, #PSR_T_BIT		)	@ exception taken in Thumb mode?
271
+ THUMB(	movne	r1, #2			)	@ if so, fix up PC correction
296272 	mov	r0, sp				@ struct pt_regs *regs
297273 	bl	__und_fault
298274 
....@@ -640,7 +616,7 @@
640616 	@ Test if we need to give access to iWMMXt coprocessors
641617 	ldr	r5, [r10, #TI_FLAGS]
642618 	rsbs	r7, r8, #(1 << 8)		@ CP 0 or 1 only
643
-	movcss	r7, r5, lsr #(TIF_USING_IWMMXT + 1)
619
+	movscs	r7, r5, lsr #(TIF_USING_IWMMXT + 1)
644620 	bcs	iwmmxt_task_enable
645621 #endif
646622  ARM(	add	pc, pc, r8, lsr #6	)
....@@ -833,7 +809,7 @@
833809  * existing ones.  This mechanism should be used only for things that are
834810  * really small and justified, and not be abused freely.
835811  *
836
- * See Documentation/arm/kernel_user_helpers.txt for formal definitions.
812
+ * See Documentation/arm/kernel_user_helpers.rst for formal definitions.
837813  */
838814  THUMB(	.arm	)
839815 
....@@ -876,7 +852,7 @@
876852 	smp_dmb	arm
877853 1:	ldrexd	r0, r1, [r2]			@ load current val
878854 	eors	r3, r0, r4			@ compare with oldval (1)
879
-	eoreqs	r3, r1, r5			@ compare with oldval (2)
855
+	eorseq	r3, r1, r5			@ compare with oldval (2)
880856 	strexdeq r3, r6, r7, [r2]		@ store newval if eq
881857 	teqeq	r3, #1				@ success?
882858 	beq	1b				@ if no then retry
....@@ -900,8 +876,8 @@
900876 	ldmia	r1, {r6, lr}			@ load new val
901877 1:	ldmia	r2, {r0, r1}			@ load current val
902878 	eors	r3, r0, r4			@ compare with oldval (1)
903
-	eoreqs	r3, r1, r5			@ compare with oldval (2)
904
-2:	stmeqia	r2, {r6, lr}			@ store newval if eq
879
+	eorseq	r3, r1, r5			@ compare with oldval (2)
880
+2:	stmiaeq	r2, {r6, lr}			@ store newval if eq
905881 	rsbs	r0, r3, #0			@ set return val and C flag
906882 	ldmfd	sp!, {r4, r5, r6, pc}
907883 
....@@ -915,7 +891,7 @@
915891 	mov	r7, #0xffff0fff
916892 	sub	r7, r7, #(0xffff0fff - (0xffff0f60 + (1b - __kuser_cmpxchg64)))
917893 	subs	r8, r4, r7
918
-	rsbcss	r8, r8, #(2b - 1b)
894
+	rsbscs	r8, r8, #(2b - 1b)
919895 	strcs	r7, [sp, #S_PC]
920896 #if __LINUX_ARM_ARCH__ < 6
921897 	bcc	kuser_cmpxchg32_fixup
....@@ -973,7 +949,7 @@
973949 	mov	r7, #0xffff0fff
974950 	sub	r7, r7, #(0xffff0fff - (0xffff0fc0 + (1b - __kuser_cmpxchg)))
975951 	subs	r8, r4, r7
976
-	rsbcss	r8, r8, #(2b - 1b)
952
+	rsbscs	r8, r8, #(2b - 1b)
977953 	strcs	r7, [sp, #S_PC]
978954 	ret	lr
979955 	.previous
....@@ -1042,12 +1018,11 @@
10421018 	sub	lr, lr, #\correction
10431019 	.endif
10441020 
1045
-	@
1046
-	@ Save r0, lr_<exception> (parent PC) and spsr_<exception>
1047
-	@ (parent CPSR)
1048
-	@
1021
+	@ Save r0, lr_<exception> (parent PC)
10491022 	stmia	sp, {r0, lr}		@ save r0, lr
1050
-	mrs	lr, spsr
1023
+
1024
+	@ Save spsr_<exception> (parent CPSR)
1025
+2:	mrs	lr, spsr
10511026 	str	lr, [sp, #8]		@ save spsr
10521027 
10531028 	@
....@@ -1068,6 +1043,44 @@
10681043 	movs	pc, lr			@ branch to handler in SVC mode
10691044 ENDPROC(vector_\name)
10701045 
1046
+#ifdef CONFIG_HARDEN_BRANCH_HISTORY
1047
+	.subsection 1
1048
+	.align 5
1049
+vector_bhb_loop8_\name:
1050
+	.if \correction
1051
+	sub	lr, lr, #\correction
1052
+	.endif
1053
+
1054
+	@ Save r0, lr_<exception> (parent PC)
1055
+	stmia	sp, {r0, lr}
1056
+
1057
+	@ bhb workaround
1058
+	mov	r0, #8
1059
+3:	W(b)	. + 4
1060
+	subs	r0, r0, #1
1061
+	bne	3b
1062
+	dsb
1063
+	isb
1064
+	b	2b
1065
+ENDPROC(vector_bhb_loop8_\name)
1066
+
1067
+vector_bhb_bpiall_\name:
1068
+	.if \correction
1069
+	sub	lr, lr, #\correction
1070
+	.endif
1071
+
1072
+	@ Save r0, lr_<exception> (parent PC)
1073
+	stmia	sp, {r0, lr}
1074
+
1075
+	@ bhb workaround
1076
+	mcr	p15, 0, r0, c7, c5, 6	@ BPIALL
1077
+	@ isb not needed due to "movs pc, lr" in the vector stub
1078
+	@ which gives a "context synchronisation".
1079
+	b	2b
1080
+ENDPROC(vector_bhb_bpiall_\name)
1081
+	.previous
1082
+#endif
1083
+
10711084 	.align	2
10721085 	@ handler addresses follow this label
10731086 1:
....@@ -1076,6 +1089,10 @@
10761089 	.section .stubs, "ax", %progbits
10771090 	@ This must be the first word
10781091 	.word	vector_swi
1092
+#ifdef CONFIG_HARDEN_BRANCH_HISTORY
1093
+	.word	vector_bhb_loop8_swi
1094
+	.word	vector_bhb_bpiall_swi
1095
+#endif
10791096 
10801097 vector_rst:
10811098  ARM(	swi	SYS_ERROR0	)
....@@ -1190,8 +1207,10 @@
11901207  * FIQ "NMI" handler
11911208  *-----------------------------------------------------------------------------
11921209  * Handle a FIQ using the SVC stack allowing FIQ act like NMI on x86
1193
- * systems.
1210
+ * systems. This must be the last vector stub, so lets place it in its own
1211
+ * subsection.
11941212  */
1213
+	.subsection 2
11951214 	vector_stub	fiq, FIQ_MODE, 4
11961215 
11971216 	.long	__fiq_usr			@  0  (USR_26 / USR_32)
....@@ -1224,6 +1243,30 @@
12241243 	W(b)	vector_irq
12251244 	W(b)	vector_fiq
12261245 
1246
+#ifdef CONFIG_HARDEN_BRANCH_HISTORY
1247
+	.section .vectors.bhb.loop8, "ax", %progbits
1248
+.L__vectors_bhb_loop8_start:
1249
+	W(b)	vector_rst
1250
+	W(b)	vector_bhb_loop8_und
1251
+	W(ldr)	pc, .L__vectors_bhb_loop8_start + 0x1004
1252
+	W(b)	vector_bhb_loop8_pabt
1253
+	W(b)	vector_bhb_loop8_dabt
1254
+	W(b)	vector_addrexcptn
1255
+	W(b)	vector_bhb_loop8_irq
1256
+	W(b)	vector_bhb_loop8_fiq
1257
+
1258
+	.section .vectors.bhb.bpiall, "ax", %progbits
1259
+.L__vectors_bhb_bpiall_start:
1260
+	W(b)	vector_rst
1261
+	W(b)	vector_bhb_bpiall_und
1262
+	W(ldr)	pc, .L__vectors_bhb_bpiall_start + 0x1008
1263
+	W(b)	vector_bhb_bpiall_pabt
1264
+	W(b)	vector_bhb_bpiall_dabt
1265
+	W(b)	vector_addrexcptn
1266
+	W(b)	vector_bhb_bpiall_irq
1267
+	W(b)	vector_bhb_bpiall_fiq
1268
+#endif
1269
+
12271270 	.data
12281271 	.align	2
12291272