change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/arch/arm/kernel/ftrace.c
..
..
@@ -22,6 +22,7 @@
22
22
 #include <asm/ftrace.h>
23
23
 #include <asm/insn.h>
24
24
 #include <asm/set_memory.h>
25
+#include <asm/patch.h>
25
26
 
26
27
 #ifdef CONFIG_THUMB2_KERNEL
27
28
 #define	NOP		0xf85deb04	/* pop.w {lr} */
..
..
@@ -35,9 +36,7 @@
35
36
 {
36
37
 	int *command = data;
37
38
 
38
-	set_kernel_text_rw();
39
39
 	ftrace_modify_all_code(*command);
40
-	set_kernel_text_ro();
41
40
 
42
41
 	return 0;
43
42
 }
..
..
@@ -47,30 +46,6 @@
47
46
 	stop_machine(__ftrace_modify_code, &command, NULL);
48
47
 }
49
48
 
50
-#ifdef CONFIG_OLD_MCOUNT
51
-#define OLD_MCOUNT_ADDR	((unsigned long) mcount)
52
-#define OLD_FTRACE_ADDR ((unsigned long) ftrace_caller_old)
53
-
54
-#define	OLD_NOP		0xe1a00000	/* mov r0, r0 */
55
-
56
-static unsigned long ftrace_nop_replace(struct dyn_ftrace *rec)
57
-{
58
-	return rec->arch.old_mcount ? OLD_NOP : NOP;
59
-}
60
-
61
-static unsigned long adjust_address(struct dyn_ftrace *rec, unsigned long addr)
62
-{
63
-	if (!rec->arch.old_mcount)
64
-		return addr;
65
-
66
-	if (addr == MCOUNT_ADDR)
67
-		addr = OLD_MCOUNT_ADDR;
68
-	else if (addr == FTRACE_ADDR)
69
-		addr = OLD_FTRACE_ADDR;
70
-
71
-	return addr;
72
-}
73
-#else
74
49
 static unsigned long ftrace_nop_replace(struct dyn_ftrace *rec)
75
50
 {
76
51
 	return NOP;
..
..
@@ -80,17 +55,14 @@
80
55
 {
81
56
 	return addr;
82
57
 }
83
-#endif
84
58
 
85
59
 int ftrace_arch_code_modify_prepare(void)
86
60
 {
87
-	set_all_modules_text_rw();
88
61
 	return 0;
89
62
 }
90
63
 
91
64
 int ftrace_arch_code_modify_post_process(void)
92
65
 {
93
-	set_all_modules_text_ro();
94
66
 	/* Make sure any TLB misses during machine stop are cleared. */
95
67
 	flush_tlb_all();
96
68
 	return 0;
..
..
@@ -107,26 +79,21 @@
107
79
 {
108
80
 	unsigned long replaced;
109
81
 
110
-	if (IS_ENABLED(CONFIG_THUMB2_KERNEL)) {
82
+	if (IS_ENABLED(CONFIG_THUMB2_KERNEL))
111
83
 		old = __opcode_to_mem_thumb32(old);
112
-		new = __opcode_to_mem_thumb32(new);
113
-	} else {
84
+	else
114
85
 		old = __opcode_to_mem_arm(old);
115
-		new = __opcode_to_mem_arm(new);
116
-	}
117
86
 
118
87
 	if (validate) {
119
-		if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE))
88
+		if (copy_from_kernel_nofault(&replaced, (void *)pc,
89
+				MCOUNT_INSN_SIZE))
120
90
 			return -EFAULT;
121
91
 
122
92
 		if (replaced != old)
123
93
 			return -EINVAL;
124
94
 	}
125
95
 
126
-	if (probe_kernel_write((void *)pc, &new, MCOUNT_INSN_SIZE))
127
-		return -EPERM;
128
-
129
-	flush_icache_range(pc, pc + MCOUNT_INSN_SIZE);
96
+	__patch_text((void *)pc, new);
130
97
 
131
98
 	return 0;
132
99
 }
..
..
@@ -145,15 +112,6 @@
145
112
 #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
146
113
 	if (!ret) {
147
114
 		pc = (unsigned long)&ftrace_regs_call;
148
-		new = ftrace_call_replace(pc, (unsigned long)func, true);
149
-
150
-		ret = ftrace_modify_code(pc, 0, new, false);
151
-	}
152
-#endif
153
-
154
-#ifdef CONFIG_OLD_MCOUNT
155
-	if (!ret) {
156
-		pc = (unsigned long)&ftrace_call_old;
157
115
 		new = ftrace_call_replace(pc, (unsigned long)func, true);
158
116
 
159
117
 		ret = ftrace_modify_code(pc, 0, new, false);
..
..
@@ -233,16 +191,6 @@
233
191
 	new = ftrace_nop_replace(rec);
234
192
 	ret = ftrace_modify_code(ip, old, new, true);
235
193
 
236
-#ifdef CONFIG_OLD_MCOUNT
237
-	if (ret == -EINVAL && addr == MCOUNT_ADDR) {
238
-		rec->arch.old_mcount = true;
239
-
240
-		old = ftrace_call_replace(ip, adjust_address(rec, addr), true);
241
-		new = ftrace_nop_replace(rec);
242
-		ret = ftrace_modify_code(ip, old, new, true);
243
-	}
244
-#endif
245
-
246
194
 	return ret;
247
195
 }
248
196
 
..
..
@@ -304,13 +252,6 @@
304
252
 				     enable);
305
253
 #endif
306
254
 
307
-
308
-#ifdef CONFIG_OLD_MCOUNT
309
-	if (!ret)
310
-		ret = __ftrace_modify_caller(&ftrace_graph_call_old,
311
-					     ftrace_graph_caller_old,
312
-					     enable);
313
-#endif
314
255
 
315
256
 	return ret;
316
257
 }