Skip to content

Commit

Permalink
[MIPS] vpe: handle halting TCs in an errata safe way.
Browse files Browse the repository at this point in the history
Adds a JR.HB after halting a TC, to ensure that the TC has really halted.
only modifies the TCSTATUS register when the TC is safely halted.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Nigel Stephens authored and ralfbaechle committed Nov 15, 2007
1 parent 8dfa741 commit 7c3a622
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions arch/mips/kernel/vpe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,7 @@ static void cleanup_tc(struct tc *tc)
write_tc_c0_tcstatus(tmp);

write_tc_c0_tchalt(TCHALT_H);
mips_ihb();

/* bind it to anything other than VPE1 */
// write_tc_c0_tcbind(read_tc_c0_tcbind() & ~TCBIND_CURVPE); // | TCBIND_CURVPE
Expand Down Expand Up @@ -1235,9 +1236,12 @@ int vpe_free(vpe_handle vpe)
settc(t->index);
write_vpe_c0_vpeconf0(read_vpe_c0_vpeconf0() & ~VPECONF0_VPA);

/* mark the TC unallocated and halt'ed */
write_tc_c0_tcstatus(read_tc_c0_tcstatus() & ~TCSTATUS_A);
/* halt the TC */
write_tc_c0_tchalt(TCHALT_H);
mips_ihb();

/* mark the TC unallocated */
write_tc_c0_tcstatus(read_tc_c0_tcstatus() & ~TCSTATUS_A);

v->state = VPE_STATE_UNUSED;

Expand Down Expand Up @@ -1533,14 +1537,16 @@ static int __init vpe_module_init(void)
t->pvpe = get_vpe(0); /* set the parent vpe */
}

/* halt the TC */
write_tc_c0_tchalt(TCHALT_H);
mips_ihb();

tmp = read_tc_c0_tcstatus();

/* mark not activated and not dynamically allocatable */
tmp &= ~(TCSTATUS_A | TCSTATUS_DA);
tmp |= TCSTATUS_IXMT; /* interrupt exempt */
write_tc_c0_tcstatus(tmp);

write_tc_c0_tchalt(TCHALT_H);
}
}

Expand Down

0 comments on commit 7c3a622

Please sign in to comment.