diff options
Diffstat (limited to 'arch/mips/kernel/cps-vec.S')
-rw-r--r-- | arch/mips/kernel/cps-vec.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S index 0384b05ab5a0..55b759a0019e 100644 --- a/arch/mips/kernel/cps-vec.S +++ b/arch/mips/kernel/cps-vec.S | |||
@@ -99,11 +99,11 @@ not_nmi: | |||
99 | xori t2, t1, 0x7 | 99 | xori t2, t1, 0x7 |
100 | beqz t2, 1f | 100 | beqz t2, 1f |
101 | li t3, 32 | 101 | li t3, 32 |
102 | addi t1, t1, 1 | 102 | addiu t1, t1, 1 |
103 | sllv t1, t3, t1 | 103 | sllv t1, t3, t1 |
104 | 1: /* At this point t1 == I-cache sets per way */ | 104 | 1: /* At this point t1 == I-cache sets per way */ |
105 | _EXT t2, v0, MIPS_CONF1_IA_SHF, MIPS_CONF1_IA_SZ | 105 | _EXT t2, v0, MIPS_CONF1_IA_SHF, MIPS_CONF1_IA_SZ |
106 | addi t2, t2, 1 | 106 | addiu t2, t2, 1 |
107 | mul t1, t1, t0 | 107 | mul t1, t1, t0 |
108 | mul t1, t1, t2 | 108 | mul t1, t1, t2 |
109 | 109 | ||
@@ -126,11 +126,11 @@ icache_done: | |||
126 | xori t2, t1, 0x7 | 126 | xori t2, t1, 0x7 |
127 | beqz t2, 1f | 127 | beqz t2, 1f |
128 | li t3, 32 | 128 | li t3, 32 |
129 | addi t1, t1, 1 | 129 | addiu t1, t1, 1 |
130 | sllv t1, t3, t1 | 130 | sllv t1, t3, t1 |
131 | 1: /* At this point t1 == D-cache sets per way */ | 131 | 1: /* At this point t1 == D-cache sets per way */ |
132 | _EXT t2, v0, MIPS_CONF1_DA_SHF, MIPS_CONF1_DA_SZ | 132 | _EXT t2, v0, MIPS_CONF1_DA_SHF, MIPS_CONF1_DA_SZ |
133 | addi t2, t2, 1 | 133 | addiu t2, t2, 1 |
134 | mul t1, t1, t0 | 134 | mul t1, t1, t0 |
135 | mul t1, t1, t2 | 135 | mul t1, t1, t2 |
136 | 136 | ||
@@ -250,7 +250,7 @@ LEAF(mips_cps_core_init) | |||
250 | mfc0 t0, CP0_MVPCONF0 | 250 | mfc0 t0, CP0_MVPCONF0 |
251 | srl t0, t0, MVPCONF0_PVPE_SHIFT | 251 | srl t0, t0, MVPCONF0_PVPE_SHIFT |
252 | andi t0, t0, (MVPCONF0_PVPE >> MVPCONF0_PVPE_SHIFT) | 252 | andi t0, t0, (MVPCONF0_PVPE >> MVPCONF0_PVPE_SHIFT) |
253 | addi t7, t0, 1 | 253 | addiu t7, t0, 1 |
254 | 254 | ||
255 | /* If there's only 1, we're done */ | 255 | /* If there's only 1, we're done */ |
256 | beqz t0, 2f | 256 | beqz t0, 2f |
@@ -280,7 +280,7 @@ LEAF(mips_cps_core_init) | |||
280 | mttc0 t0, CP0_TCHALT | 280 | mttc0 t0, CP0_TCHALT |
281 | 281 | ||
282 | /* Next VPE */ | 282 | /* Next VPE */ |
283 | addi t5, t5, 1 | 283 | addiu t5, t5, 1 |
284 | slt t0, t5, t7 | 284 | slt t0, t5, t7 |
285 | bnez t0, 1b | 285 | bnez t0, 1b |
286 | nop | 286 | nop |
@@ -317,7 +317,7 @@ LEAF(mips_cps_boot_vpes) | |||
317 | mfc0 t1, CP0_MVPCONF0 | 317 | mfc0 t1, CP0_MVPCONF0 |
318 | srl t1, t1, MVPCONF0_PVPE_SHIFT | 318 | srl t1, t1, MVPCONF0_PVPE_SHIFT |
319 | andi t1, t1, MVPCONF0_PVPE >> MVPCONF0_PVPE_SHIFT | 319 | andi t1, t1, MVPCONF0_PVPE >> MVPCONF0_PVPE_SHIFT |
320 | addi t1, t1, 1 | 320 | addiu t1, t1, 1 |
321 | 321 | ||
322 | /* Calculate a mask for the VPE ID from EBase.CPUNum */ | 322 | /* Calculate a mask for the VPE ID from EBase.CPUNum */ |
323 | clz t1, t1 | 323 | clz t1, t1 |
@@ -424,7 +424,7 @@ LEAF(mips_cps_boot_vpes) | |||
424 | 424 | ||
425 | /* Next VPE */ | 425 | /* Next VPE */ |
426 | 2: srl t6, t6, 1 | 426 | 2: srl t6, t6, 1 |
427 | addi t5, t5, 1 | 427 | addiu t5, t5, 1 |
428 | bnez t6, 1b | 428 | bnez t6, 1b |
429 | nop | 429 | nop |
430 | 430 | ||