aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/smtc.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/kernel/smtc.c')
-rw-r--r--arch/mips/kernel/smtc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 1d47843d3cc0..1c152a93dc7b 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -235,7 +235,7 @@ static void smtc_configure_tlb(void)
235 mips_ihb(); 235 mips_ihb();
236 /* No need to un-Halt - that happens later anyway */ 236 /* No need to un-Halt - that happens later anyway */
237 for (i=0; i < vpes; i++) { 237 for (i=0; i < vpes; i++) {
238 write_tc_c0_tcbind(i); 238 write_tc_c0_tcbind(i);
239 /* 239 /*
240 * To be 100% sure we're really getting the right 240 * To be 100% sure we're really getting the right
241 * information, we exit the configuration state 241 * information, we exit the configuration state
@@ -286,7 +286,7 @@ static void smtc_configure_tlb(void)
286 286
287/* 287/*
288 * Incrementally build the CPU map out of constituent MIPS MT cores, 288 * Incrementally build the CPU map out of constituent MIPS MT cores,
289 * using the specified available VPEs and TCs. Plaform code needs 289 * using the specified available VPEs and TCs. Plaform code needs
290 * to ensure that each MIPS MT core invokes this routine on reset, 290 * to ensure that each MIPS MT core invokes this routine on reset,
291 * one at a time(!). 291 * one at a time(!).
292 * 292 *
@@ -348,7 +348,7 @@ static void smtc_tc_setup(int vpe, int tc, int cpu)
348 { 348 {
349 /* 349 /*
350 * FIXME: Multi-core SMTC hasn't been tested and the 350 * FIXME: Multi-core SMTC hasn't been tested and the
351 * maximum number of VPEs may change. 351 * maximum number of VPEs may change.
352 */ 352 */
353 cp1contexts[0] = smtc_nconf1[0] - 1; 353 cp1contexts[0] = smtc_nconf1[0] - 1;
354 cp1contexts[1] = smtc_nconf1[1]; 354 cp1contexts[1] = smtc_nconf1[1];
@@ -761,9 +761,9 @@ void smtc_forward_irq(struct irq_data *d)
761 * mask has been purged of bits corresponding to nonexistent and 761 * mask has been purged of bits corresponding to nonexistent and
762 * offline "CPUs", and to TCs bound to VPEs other than the VPE 762 * offline "CPUs", and to TCs bound to VPEs other than the VPE
763 * connected to the physical interrupt input for the interrupt 763 * connected to the physical interrupt input for the interrupt
764 * in question. Otherwise we have a nasty problem with interrupt 764 * in question. Otherwise we have a nasty problem with interrupt
765 * mask management. This is best handled in non-performance-critical 765 * mask management. This is best handled in non-performance-critical
766 * platform IRQ affinity setting code, to minimize interrupt-time 766 * platform IRQ affinity setting code, to minimize interrupt-time
767 * checks. 767 * checks.
768 */ 768 */
769 769
@@ -899,10 +899,10 @@ void smtc_send_ipi(int cpu, int type, unsigned int action)
899 mips_ihb(); 899 mips_ihb();
900 900
901 /* 901 /*
902 * Inspect TCStatus - if IXMT is set, we have to queue 902 * Inspect TCStatus - if IXMT is set, we have to queue
903 * a message. Otherwise, we set up the "interrupt" 903 * a message. Otherwise, we set up the "interrupt"
904 * of the other TC 904 * of the other TC
905 */ 905 */
906 tcstatus = read_tc_c0_tcstatus(); 906 tcstatus = read_tc_c0_tcstatus();
907 907
908 if ((tcstatus & TCSTATUS_IXMT) != 0) { 908 if ((tcstatus & TCSTATUS_IXMT) != 0) {
@@ -964,7 +964,7 @@ static void post_direct_ipi(int cpu, struct smtc_ipi *pipi)
964 * CU bit of Status is indicator that TC was 964 * CU bit of Status is indicator that TC was
965 * already running on a kernel stack... 965 * already running on a kernel stack...
966 */ 966 */
967 if (tcstatus & ST0_CU0) { 967 if (tcstatus & ST0_CU0) {
968 /* Note that this "- 1" is pointer arithmetic */ 968 /* Note that this "- 1" is pointer arithmetic */
969 kstack = ((struct pt_regs *)read_tc_gpr_sp()) - 1; 969 kstack = ((struct pt_regs *)read_tc_gpr_sp()) - 1;
970 } else { 970 } else {
@@ -1288,7 +1288,7 @@ void smtc_idle_loop_hook(void)
1288 for (tc = 0; tc < hook_ntcs; tc++) { 1288 for (tc = 0; tc < hook_ntcs; tc++) {
1289 tcnoprog[tc] = 0; 1289 tcnoprog[tc] = 0;
1290 clock_hang_reported[tc] = 0; 1290 clock_hang_reported[tc] = 0;
1291 } 1291 }
1292 for (vpe = 0; vpe < 2; vpe++) 1292 for (vpe = 0; vpe < 2; vpe++)
1293 for (im = 0; im < 8; im++) 1293 for (im = 0; im < 8; im++)
1294 imstuckcount[vpe][im] = 0; 1294 imstuckcount[vpe][im] = 0;
@@ -1485,7 +1485,7 @@ static int halt_state_save[NR_CPUS];
1485 1485
1486/* 1486/*
1487 * To really, really be sure that nothing is being done 1487 * To really, really be sure that nothing is being done
1488 * by other TCs, halt them all. This code assumes that 1488 * by other TCs, halt them all. This code assumes that
1489 * a DVPE has already been done, so while their Halted 1489 * a DVPE has already been done, so while their Halted
1490 * state is theoretically architecturally unstable, in 1490 * state is theoretically architecturally unstable, in
1491 * practice, it's not going to change while we're looking 1491 * practice, it's not going to change while we're looking