Skip to content

Commit 81a02e3

Browse files
Markos Chandrasralfbaechle
authored andcommitted
MIPS: kernel: cps-vec: Replace 'la' macro with PTR_LA
The PTR_LA macro will pick the correct "la" or "dla" macro to load an address to a register. This gets rids of the following warnings (and others) when building a 64-bit CPS kernel: arch/mips/kernel/cps-vec.S:63: Warning: la used to load 64-bit address arch/mips/kernel/cps-vec.S:159: Warning: la used to load 64-bit address arch/mips/kernel/cps-vec.S:220: Warning: la used to load 64-bit address arch/mips/kernel/cps-vec.S:240: Warning: la used to load 64-bit address [...] Cc: <[email protected]> # 3.16+ Reviewed-by: Paul Burton <[email protected]> Signed-off-by: Markos Chandras <[email protected]> Cc: [email protected] Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/10587/ Signed-off-by: Ralf Baechle <[email protected]>
1 parent fd5ed30 commit 81a02e3

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

arch/mips/kernel/cps-vec.S

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ LEAF(mips_cps_core_entry)
6060
nop
6161

6262
/* This is an NMI */
63-
la k0, nmi_handler
63+
PTR_LA k0, nmi_handler
6464
jr k0
6565
nop
6666

@@ -156,7 +156,7 @@ dcache_done:
156156
ehb
157157

158158
/* Jump to kseg0 */
159-
la t0, 1f
159+
PTR_LA t0, 1f
160160
jr t0
161161
nop
162162

@@ -217,7 +217,7 @@ LEAF(excep_intex)
217217

218218
.org 0x480
219219
LEAF(excep_ejtag)
220-
la k0, ejtag_debug_handler
220+
PTR_LA k0, ejtag_debug_handler
221221
jr k0
222222
nop
223223
END(excep_ejtag)
@@ -237,7 +237,7 @@ LEAF(mips_cps_core_init)
237237

238238
/* ...and for the moment only 1 VPE */
239239
dvpe
240-
la t1, 1f
240+
PTR_LA t1, 1f
241241
jr.hb t1
242242
nop
243243

@@ -298,14 +298,14 @@ LEAF(mips_cps_core_init)
298298

299299
LEAF(mips_cps_boot_vpes)
300300
/* Retrieve CM base address */
301-
la t0, mips_cm_base
301+
PTR_LA t0, mips_cm_base
302302
lw t0, 0(t0)
303303

304304
/* Calculate a pointer to this cores struct core_boot_config */
305305
lw t0, GCR_CL_ID_OFS(t0)
306306
li t1, COREBOOTCFG_SIZE
307307
mul t0, t0, t1
308-
la t1, mips_cps_core_bootcfg
308+
PTR_LA t1, mips_cps_core_bootcfg
309309
lw t1, 0(t1)
310310
addu t0, t0, t1
311311

@@ -351,7 +351,7 @@ LEAF(mips_cps_boot_vpes)
351351

352352
1: /* Enter VPE configuration state */
353353
dvpe
354-
la t1, 1f
354+
PTR_LA t1, 1f
355355
jr.hb t1
356356
nop
357357
1: mfc0 t1, CP0_MVPCONTROL
@@ -445,7 +445,7 @@ LEAF(mips_cps_boot_vpes)
445445
/* This VPE should be offline, halt the TC */
446446
li t0, TCHALT_H
447447
mtc0 t0, CP0_TCHALT
448-
la t0, 1f
448+
PTR_LA t0, 1f
449449
1: jr.hb t0
450450
nop
451451

@@ -466,10 +466,10 @@ LEAF(mips_cps_boot_vpes)
466466
.set noat
467467
lw $1, TI_CPU(gp)
468468
sll $1, $1, LONGLOG
469-
la \dest, __per_cpu_offset
469+
PTR_LA \dest, __per_cpu_offset
470470
addu $1, $1, \dest
471471
lw $1, 0($1)
472-
la \dest, cps_cpu_state
472+
PTR_LA \dest, cps_cpu_state
473473
addu \dest, \dest, $1
474474
.set pop
475475
.endm

0 commit comments

Comments
 (0)