From: Heiher <r@xxxxxx> On SMP systems, the shared ejtag debug buffer may be overwritten by other cores, because every cores can generate ejtag exception at same time. Unfortunately, in that context, it's difficult to relax more registers to access per cpu buffers. so use ll/sc to serialize the access. Signed-off-by: Heiher <r@xxxxxx> --- arch/mips/kernel/genex.S | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index 37b9383eacd3..1af8c83835ef 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S @@ -354,6 +354,16 @@ NESTED(ejtag_debug_handler, PT_SIZE, sp) sll k0, k0, 30 # Check for SDBBP. bgez k0, ejtag_return +#ifdef CONFIG_SMP + PTR_LA k0, ejtag_debug_buffer +1: ll k0, LONGSIZE(k0) + bnez k0, 1b + PTR_LA k0, ejtag_debug_buffer + sc k0, LONGSIZE(k0) + beqz k0, 1b + sync +#endif + PTR_LA k0, ejtag_debug_buffer LONG_S k1, 0(k0) SAVE_ALL @@ -363,7 +373,12 @@ NESTED(ejtag_debug_handler, PT_SIZE, sp) PTR_LA k0, ejtag_debug_buffer LONG_L k1, 0(k0) +#ifdef CONFIG_SMP + sw zero, LONGSIZE(k0) +#endif + ejtag_return: + back_to_back_c0_hazard MFC0 k0, CP0_DESAVE .set mips32 deret @@ -377,6 +392,9 @@ ejtag_return: .data EXPORT(ejtag_debug_buffer) .fill LONGSIZE +#ifdef CONFIG_SMP + .fill LONGSIZE +#endif .previous __INIT -- 2.16.3