forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/arch/xtensa/mm/misc.S
....@@ -14,8 +14,8 @@
1414 
1515 
1616 #include <linux/linkage.h>
17
+#include <linux/pgtable.h>
1718 #include <asm/page.h>
18
-#include <asm/pgtable.h>
1919 #include <asm/asmmacro.h>
2020 #include <asm/cacheasm.h>
2121 #include <asm/tlbflush.h>
....@@ -30,7 +30,7 @@
3030 
3131 ENTRY(clear_page)
3232 
33
-	entry	a1, 16
33
+	abi_entry_default
3434 
3535 	movi	a3, 0
3636 	__loopi	a2, a7, PAGE_SIZE, 32
....@@ -44,7 +44,7 @@
4444 	s32i	a3, a2, 28
4545 	__endla	a2, a7, 32
4646 
47
-	retw
47
+	abi_ret_default
4848 
4949 ENDPROC(clear_page)
5050 
....@@ -57,7 +57,7 @@
5757 
5858 ENTRY(copy_page)
5959 
60
-	entry	a1, 16
60
+	abi_entry_default
6161 
6262 	__loopi a2, a4, PAGE_SIZE, 32
6363 
....@@ -86,7 +86,7 @@
8686 
8787 	__endl  a2, a4
8888 
89
-	retw
89
+	abi_ret_default
9090 
9191 ENDPROC(copy_page)
9292 
....@@ -116,7 +116,7 @@
116116 
117117 ENTRY(clear_page_alias)
118118 
119
-	entry	a1, 32
119
+	abi_entry_default
120120 
121121 	/* Skip setting up a temporary DTLB if not aliased low page. */
122122 
....@@ -144,14 +144,14 @@
144144 	__endla	a2, a7, 32
145145 
146146 	bnez	a6, 1f
147
-	retw
147
+	abi_ret_default
148148 
149149 	/* We need to invalidate the temporary idtlb entry, if any. */
150150 
151151 1:	idtlb	a4
152152 	dsync
153153 
154
-	retw
154
+	abi_ret_default
155155 
156156 ENDPROC(clear_page_alias)
157157 
....@@ -164,7 +164,7 @@
164164 
165165 ENTRY(copy_page_alias)
166166 
167
-	entry	a1, 32
167
+	abi_entry_default
168168 
169169 	/* Skip setting up a temporary DTLB for destination if not aliased. */
170170 
....@@ -221,19 +221,19 @@
221221 
222222 	bnez	a6, 1f
223223 	bnez	a7, 2f
224
-	retw
224
+	abi_ret_default
225225 
226226 1:	addi	a2, a2, -PAGE_SIZE
227227 	idtlb	a2
228228 	dsync
229229 	bnez	a7, 2f
230
-	retw
230
+	abi_ret_default
231231 
232232 2:	addi	a3, a3, -PAGE_SIZE+1
233233 	idtlb	a3
234234 	dsync
235235 
236
-	retw
236
+	abi_ret_default
237237 
238238 ENDPROC(copy_page_alias)
239239 
....@@ -248,7 +248,7 @@
248248 
249249 ENTRY(__flush_invalidate_dcache_page_alias)
250250 
251
-	entry	sp, 16
251
+	abi_entry_default
252252 
253253 	movi	a7, 0			# required for exception handler
254254 	addi	a6, a3, (PAGE_KERNEL | _PAGE_HW_WRITE)
....@@ -261,7 +261,7 @@
261261 	idtlb	a4
262262 	dsync
263263 
264
-	retw
264
+	abi_ret_default
265265 
266266 ENDPROC(__flush_invalidate_dcache_page_alias)
267267 
....@@ -272,7 +272,7 @@
272272 
273273 ENTRY(__invalidate_dcache_page_alias)
274274 
275
-	entry	sp, 16
275
+	abi_entry_default
276276 
277277 	movi	a7, 0			# required for exception handler
278278 	addi	a6, a3, (PAGE_KERNEL | _PAGE_HW_WRITE)
....@@ -285,7 +285,7 @@
285285 	idtlb	a4
286286 	dsync
287287 
288
-	retw
288
+	abi_ret_default
289289 
290290 ENDPROC(__invalidate_dcache_page_alias)
291291 #endif
....@@ -296,7 +296,7 @@
296296 	
297297 ENTRY(__invalidate_icache_page_alias)
298298 
299
-	entry	sp, 16
299
+	abi_entry_default
300300 
301301 	addi	a6, a3, (PAGE_KERNEL_EXEC | _PAGE_HW_WRITE)
302302 	mov	a4, a2
....@@ -307,7 +307,7 @@
307307 
308308 	iitlb	a4
309309 	isync
310
-	retw
310
+	abi_ret_default
311311 
312312 ENDPROC(__invalidate_icache_page_alias)
313313 
....@@ -325,12 +325,12 @@
325325 
326326 ENTRY(__invalidate_icache_page)
327327 
328
-	entry	sp, 16
328
+	abi_entry_default
329329 
330330 	___invalidate_icache_page a2 a3
331331 	isync
332332 
333
-	retw
333
+	abi_ret_default
334334 
335335 ENDPROC(__invalidate_icache_page)
336336 
....@@ -340,12 +340,12 @@
340340 
341341 ENTRY(__invalidate_dcache_page)
342342 
343
-	entry	sp, 16
343
+	abi_entry_default
344344 
345345 	___invalidate_dcache_page a2 a3
346346 	dsync
347347 
348
-	retw
348
+	abi_ret_default
349349 
350350 ENDPROC(__invalidate_dcache_page)
351351 
....@@ -355,12 +355,12 @@
355355 
356356 ENTRY(__flush_invalidate_dcache_page)
357357 
358
-	entry	sp, 16
358
+	abi_entry_default
359359 
360360 	___flush_invalidate_dcache_page a2 a3
361361 
362362 	dsync
363
-	retw
363
+	abi_ret_default
364364 
365365 ENDPROC(__flush_invalidate_dcache_page)
366366 
....@@ -370,12 +370,12 @@
370370 
371371 ENTRY(__flush_dcache_page)
372372 
373
-	entry	sp, 16
373
+	abi_entry_default
374374 
375375 	___flush_dcache_page a2 a3
376376 
377377 	dsync
378
-	retw
378
+	abi_ret_default
379379 
380380 ENDPROC(__flush_dcache_page)
381381 
....@@ -385,12 +385,12 @@
385385 
386386 ENTRY(__invalidate_icache_range)
387387 
388
-	entry	sp, 16
388
+	abi_entry_default
389389 
390390 	___invalidate_icache_range a2 a3 a4
391391 	isync
392392 
393
-	retw
393
+	abi_ret_default
394394 
395395 ENDPROC(__invalidate_icache_range)
396396 
....@@ -400,12 +400,12 @@
400400 
401401 ENTRY(__flush_invalidate_dcache_range)
402402 
403
-	entry	sp, 16
403
+	abi_entry_default
404404 
405405 	___flush_invalidate_dcache_range a2 a3 a4
406406 	dsync
407407 
408
-	retw
408
+	abi_ret_default
409409 
410410 ENDPROC(__flush_invalidate_dcache_range)
411411 
....@@ -415,12 +415,12 @@
415415 
416416 ENTRY(__flush_dcache_range)
417417 
418
-	entry	sp, 16
418
+	abi_entry_default
419419 
420420 	___flush_dcache_range a2 a3 a4
421421 	dsync
422422 
423
-	retw
423
+	abi_ret_default
424424 
425425 ENDPROC(__flush_dcache_range)
426426 
....@@ -430,11 +430,11 @@
430430 
431431 ENTRY(__invalidate_dcache_range)
432432 
433
-	entry	sp, 16
433
+	abi_entry_default
434434 
435435 	___invalidate_dcache_range a2 a3 a4
436436 
437
-	retw
437
+	abi_ret_default
438438 
439439 ENDPROC(__invalidate_dcache_range)
440440 
....@@ -444,12 +444,12 @@
444444 
445445 ENTRY(__invalidate_icache_all)
446446 
447
-	entry	sp, 16
447
+	abi_entry_default
448448 
449449 	___invalidate_icache_all a2 a3
450450 	isync
451451 
452
-	retw
452
+	abi_ret_default
453453 
454454 ENDPROC(__invalidate_icache_all)
455455 
....@@ -459,12 +459,12 @@
459459 
460460 ENTRY(__flush_invalidate_dcache_all)
461461 
462
-	entry	sp, 16
462
+	abi_entry_default
463463 
464464 	___flush_invalidate_dcache_all a2 a3
465465 	dsync
466466 
467
-	retw
467
+	abi_ret_default
468468 
469469 ENDPROC(__flush_invalidate_dcache_all)
470470 
....@@ -474,11 +474,11 @@
474474 
475475 ENTRY(__invalidate_dcache_all)
476476 
477
-	entry	sp, 16
477
+	abi_entry_default
478478 
479479 	___invalidate_dcache_all a2 a3
480480 	dsync
481481 
482
-	retw
482
+	abi_ret_default
483483 
484484 ENDPROC(__invalidate_dcache_all)