diff options
| -rw-r--r-- | arch/mips/kernel/cps-vec.S | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S index 55b759a0019e..a4b2d81f45dd 100644 --- a/arch/mips/kernel/cps-vec.S +++ b/arch/mips/kernel/cps-vec.S | |||
| @@ -60,7 +60,7 @@ LEAF(mips_cps_core_entry) | |||
| 60 | nop | 60 | nop |
| 61 | 61 | ||
| 62 | /* This is an NMI */ | 62 | /* This is an NMI */ |
| 63 | la k0, nmi_handler | 63 | PTR_LA k0, nmi_handler |
| 64 | jr k0 | 64 | jr k0 |
| 65 | nop | 65 | nop |
| 66 | 66 | ||
| @@ -156,7 +156,7 @@ dcache_done: | |||
| 156 | ehb | 156 | ehb |
| 157 | 157 | ||
| 158 | /* Jump to kseg0 */ | 158 | /* Jump to kseg0 */ |
| 159 | la t0, 1f | 159 | PTR_LA t0, 1f |
| 160 | jr t0 | 160 | jr t0 |
| 161 | nop | 161 | nop |
| 162 | 162 | ||
| @@ -217,7 +217,7 @@ LEAF(excep_intex) | |||
| 217 | 217 | ||
| 218 | .org 0x480 | 218 | .org 0x480 |
| 219 | LEAF(excep_ejtag) | 219 | LEAF(excep_ejtag) |
| 220 | la k0, ejtag_debug_handler | 220 | PTR_LA k0, ejtag_debug_handler |
| 221 | jr k0 | 221 | jr k0 |
| 222 | nop | 222 | nop |
| 223 | END(excep_ejtag) | 223 | END(excep_ejtag) |
| @@ -237,7 +237,7 @@ LEAF(mips_cps_core_init) | |||
| 237 | 237 | ||
| 238 | /* ...and for the moment only 1 VPE */ | 238 | /* ...and for the moment only 1 VPE */ |
| 239 | dvpe | 239 | dvpe |
| 240 | la t1, 1f | 240 | PTR_LA t1, 1f |
| 241 | jr.hb t1 | 241 | jr.hb t1 |
| 242 | nop | 242 | nop |
| 243 | 243 | ||
| @@ -298,14 +298,14 @@ LEAF(mips_cps_core_init) | |||
| 298 | 298 | ||
| 299 | LEAF(mips_cps_boot_vpes) | 299 | LEAF(mips_cps_boot_vpes) |
| 300 | /* Retrieve CM base address */ | 300 | /* Retrieve CM base address */ |
| 301 | la t0, mips_cm_base | 301 | PTR_LA t0, mips_cm_base |
| 302 | lw t0, 0(t0) | 302 | lw t0, 0(t0) |
| 303 | 303 | ||
| 304 | /* Calculate a pointer to this cores struct core_boot_config */ | 304 | /* Calculate a pointer to this cores struct core_boot_config */ |
| 305 | lw t0, GCR_CL_ID_OFS(t0) | 305 | lw t0, GCR_CL_ID_OFS(t0) |
| 306 | li t1, COREBOOTCFG_SIZE | 306 | li t1, COREBOOTCFG_SIZE |
| 307 | mul t0, t0, t1 | 307 | mul t0, t0, t1 |
| 308 | la t1, mips_cps_core_bootcfg | 308 | PTR_LA t1, mips_cps_core_bootcfg |
| 309 | lw t1, 0(t1) | 309 | lw t1, 0(t1) |
| 310 | addu t0, t0, t1 | 310 | addu t0, t0, t1 |
| 311 | 311 | ||
| @@ -351,7 +351,7 @@ LEAF(mips_cps_boot_vpes) | |||
| 351 | 351 | ||
| 352 | 1: /* Enter VPE configuration state */ | 352 | 1: /* Enter VPE configuration state */ |
| 353 | dvpe | 353 | dvpe |
| 354 | la t1, 1f | 354 | PTR_LA t1, 1f |
| 355 | jr.hb t1 | 355 | jr.hb t1 |
| 356 | nop | 356 | nop |
| 357 | 1: mfc0 t1, CP0_MVPCONTROL | 357 | 1: mfc0 t1, CP0_MVPCONTROL |
| @@ -445,7 +445,7 @@ LEAF(mips_cps_boot_vpes) | |||
| 445 | /* This VPE should be offline, halt the TC */ | 445 | /* This VPE should be offline, halt the TC */ |
| 446 | li t0, TCHALT_H | 446 | li t0, TCHALT_H |
| 447 | mtc0 t0, CP0_TCHALT | 447 | mtc0 t0, CP0_TCHALT |
| 448 | la t0, 1f | 448 | PTR_LA t0, 1f |
| 449 | 1: jr.hb t0 | 449 | 1: jr.hb t0 |
| 450 | nop | 450 | nop |
| 451 | 451 | ||
| @@ -466,10 +466,10 @@ LEAF(mips_cps_boot_vpes) | |||
| 466 | .set noat | 466 | .set noat |
| 467 | lw $1, TI_CPU(gp) | 467 | lw $1, TI_CPU(gp) |
| 468 | sll $1, $1, LONGLOG | 468 | sll $1, $1, LONGLOG |
| 469 | la \dest, __per_cpu_offset | 469 | PTR_LA \dest, __per_cpu_offset |
| 470 | addu $1, $1, \dest | 470 | addu $1, $1, \dest |
| 471 | lw $1, 0($1) | 471 | lw $1, 0($1) |
| 472 | la \dest, cps_cpu_state | 472 | PTR_LA \dest, cps_cpu_state |
| 473 | addu \dest, \dest, $1 | 473 | addu \dest, \dest, $1 |
| 474 | .set pop | 474 | .set pop |
| 475 | .endm | 475 | .endm |
