AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/arch/mips/include/asm/local.h
..
..
@@ -31,17 +31,19 @@
31
31
 {
32
32
 	unsigned long result;
33
33
 
34
-	if (kernel_uses_llsc && R10000_LLSC_WAR) {
34
+	if (kernel_uses_llsc && IS_ENABLED(CONFIG_WAR_R10000_LLSC)) {
35
35
 		unsigned long temp;
36
36
 
37
37
 		__asm__ __volatile__(
38
+		"	.set	push					\n"
38
39
 		"	.set	arch=r4000				\n"
40
+			__SYNC(full, loongson3_war) "			\n"
39
41
 		"1:"	__LL	"%1, %2		# local_add_return	\n"
40
42
 		"	addu	%0, %1, %3				\n"
41
43
 			__SC	"%0, %2					\n"
42
44
 		"	beqzl	%0, 1b					\n"
43
45
 		"	addu	%0, %1, %3				\n"
44
-		"	.set	mips0					\n"
46
+		"	.set	pop					\n"
45
47
 		: "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
46
48
 		: "Ir" (i), "m" (l->a.counter)
47
49
 		: "memory");
..
..
@@ -49,13 +51,15 @@
49
51
 		unsigned long temp;
50
52
 
51
53
 		__asm__ __volatile__(
54
+		"	.set	push					\n"
52
55
 		"	.set	"MIPS_ISA_ARCH_LEVEL"			\n"
56
+			__SYNC(full, loongson3_war) "			\n"
53
57
 		"1:"	__LL	"%1, %2		# local_add_return	\n"
54
58
 		"	addu	%0, %1, %3				\n"
55
59
 			__SC	"%0, %2					\n"
56
60
 		"	beqz	%0, 1b					\n"
57
61
 		"	addu	%0, %1, %3				\n"
58
-		"	.set	mips0					\n"
62
+		"	.set	pop					\n"
59
63
 		: "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
60
64
 		: "Ir" (i), "m" (l->a.counter)
61
65
 		: "memory");
..
..
@@ -76,17 +80,19 @@
76
80
 {
77
81
 	unsigned long result;
78
82
 
79
-	if (kernel_uses_llsc && R10000_LLSC_WAR) {
83
+	if (kernel_uses_llsc && IS_ENABLED(CONFIG_WAR_R10000_LLSC)) {
80
84
 		unsigned long temp;
81
85
 
82
86
 		__asm__ __volatile__(
87
+		"	.set	push					\n"
83
88
 		"	.set	arch=r4000				\n"
89
+			__SYNC(full, loongson3_war) "			\n"
84
90
 		"1:"	__LL	"%1, %2		# local_sub_return	\n"
85
91
 		"	subu	%0, %1, %3				\n"
86
92
 			__SC	"%0, %2					\n"
87
93
 		"	beqzl	%0, 1b					\n"
88
94
 		"	subu	%0, %1, %3				\n"
89
-		"	.set	mips0					\n"
95
+		"	.set	pop					\n"
90
96
 		: "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
91
97
 		: "Ir" (i), "m" (l->a.counter)
92
98
 		: "memory");
..
..
@@ -94,13 +100,15 @@
94
100
 		unsigned long temp;
95
101
 
96
102
 		__asm__ __volatile__(
103
+		"	.set	push					\n"
97
104
 		"	.set	"MIPS_ISA_ARCH_LEVEL"			\n"
105
+			__SYNC(full, loongson3_war) "			\n"
98
106
 		"1:"	__LL	"%1, %2		# local_sub_return	\n"
99
107
 		"	subu	%0, %1, %3				\n"
100
108
 			__SC	"%0, %2					\n"
101
109
 		"	beqz	%0, 1b					\n"
102
110
 		"	subu	%0, %1, %3				\n"
103
-		"	.set	mips0					\n"
111
+		"	.set	pop					\n"
104
112
 		: "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
105
113
 		: "Ir" (i), "m" (l->a.counter)
106
114
 		: "memory");