Commit 192ef366 authored by Ralf Baechle's avatar Ralf Baechle

[MIPS] TRACE_IRQFLAGS_SUPPORT support.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 8d197f3d
menu "Kernel hacking" menu "Kernel hacking"
config TRACE_IRQFLAGS_SUPPORT
bool
default y
source "lib/Kconfig.debug" source "lib/Kconfig.debug"
config CROSSCOMPILE config CROSSCOMPILE
......
...@@ -113,6 +113,21 @@ FEXPORT(restore_all) # restore full frame ...@@ -113,6 +113,21 @@ FEXPORT(restore_all) # restore full frame
RESTORE_AT RESTORE_AT
RESTORE_STATIC RESTORE_STATIC
FEXPORT(restore_partial) # restore partial frame FEXPORT(restore_partial) # restore partial frame
#ifdef CONFIG_TRACE_IRQFLAGS
SAVE_STATIC
SAVE_AT
SAVE_TEMP
LONG_L v0, PT_STATUS(sp)
and v0, 1
beqz v0, 1f
jal trace_hardirqs_on
b 2f
1: jal trace_hardirqs_off
2:
RESTORE_TEMP
RESTORE_AT
RESTORE_STATIC
#endif
RESTORE_SOME RESTORE_SOME
RESTORE_SP_AND_RET RESTORE_SP_AND_RET
.set at .set at
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/irqflags.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/regdef.h> #include <asm/regdef.h>
#include <asm/stackframe.h> #include <asm/stackframe.h>
...@@ -120,6 +121,7 @@ ...@@ -120,6 +121,7 @@
LONG_S $31, GDB_FR_REG31(sp) LONG_S $31, GDB_FR_REG31(sp)
CLI /* disable interrupts */ CLI /* disable interrupts */
TRACE_IRQS_OFF
/* /*
* Followed by the floating point registers * Followed by the floating point registers
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm/cacheops.h> #include <asm/cacheops.h>
#include <asm/irqflags.h>
#include <asm/regdef.h> #include <asm/regdef.h>
#include <asm/fpregdef.h> #include <asm/fpregdef.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
...@@ -128,6 +129,7 @@ handle_vcei: ...@@ -128,6 +129,7 @@ handle_vcei:
NESTED(handle_int, PT_SIZE, sp) NESTED(handle_int, PT_SIZE, sp)
SAVE_ALL SAVE_ALL
CLI CLI
TRACE_IRQS_OFF
PTR_LA ra, ret_from_irq PTR_LA ra, ret_from_irq
move a0, sp move a0, sp
...@@ -216,6 +218,7 @@ NESTED(except_vec_vi_handler, 0, sp) ...@@ -216,6 +218,7 @@ NESTED(except_vec_vi_handler, 0, sp)
_ehb _ehb
#endif /* CONFIG_MIPS_MT_SMTC */ #endif /* CONFIG_MIPS_MT_SMTC */
CLI CLI
TRACE_IRQS_OFF
move a0, sp move a0, sp
jalr v0 jalr v0
j ret_from_irq j ret_from_irq
...@@ -288,11 +291,13 @@ NESTED(nmi_handler, PT_SIZE, sp) ...@@ -288,11 +291,13 @@ NESTED(nmi_handler, PT_SIZE, sp)
.endm .endm
.macro __build_clear_sti .macro __build_clear_sti
TRACE_IRQS_ON
STI STI
.endm .endm
.macro __build_clear_cli .macro __build_clear_cli
CLI CLI
TRACE_IRQS_OFF
.endm .endm
.macro __build_clear_fpe .macro __build_clear_fpe
...@@ -300,6 +305,7 @@ NESTED(nmi_handler, PT_SIZE, sp) ...@@ -300,6 +305,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
li a2, ~(0x3f << 12) li a2, ~(0x3f << 12)
and a2, a1 and a2, a1
ctc1 a2, fcr31 ctc1 a2, fcr31
TRACE_IRQS_ON
STI STI
.endm .endm
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Copyright (C) 1994, 1995 Waldorf Electronics * Copyright (C) 1994, 1995 Waldorf Electronics
* Written by Ralf Baechle and Andreas Busse * Written by Ralf Baechle and Andreas Busse
* Copyright (C) 1994, 95, 96, 97, 98, 99, 2003 Ralf Baechle * Copyright (C) 1994 - 99, 2003, 06 Ralf Baechle
* Copyright (C) 1996 Paul M. Antoine * Copyright (C) 1996 Paul M. Antoine
* Modified for DECStation and hence R3000 support by Paul M. Antoine * Modified for DECStation and hence R3000 support by Paul M. Antoine
* Further modifications by David S. Miller and Harald Koerfgen * Further modifications by David S. Miller and Harald Koerfgen
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm/irqflags.h>
#include <asm/regdef.h> #include <asm/regdef.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
......
...@@ -3,13 +3,14 @@ ...@@ -3,13 +3,14 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
* *
* Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 by Ralf Baechle * Copyright (C) 1995-99, 2000- 02, 06 Ralf Baechle <ralf@linux-mips.org>
* Copyright (C) 2001 MIPS Technologies, Inc. * Copyright (C) 2001 MIPS Technologies, Inc.
* Copyright (C) 2004 Thiemo Seufer * Copyright (C) 2004 Thiemo Seufer
*/ */
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm/irqflags.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/regdef.h> #include <asm/regdef.h>
#include <asm/stackframe.h> #include <asm/stackframe.h>
...@@ -27,6 +28,18 @@ ...@@ -27,6 +28,18 @@
NESTED(handle_sys, PT_SIZE, sp) NESTED(handle_sys, PT_SIZE, sp)
.set noat .set noat
SAVE_SOME SAVE_SOME
#ifdef CONFIG_TRACE_IRQFLAGS
TRACE_IRQS_ON
#ifdef CONFIG_64BIT
LONG_L $8, PT_R8(sp)
LONG_L $9, PT_R9(sp)
#endif
LONG_L $7, PT_R7(sp)
LONG_L $6, PT_R6(sp)
LONG_L $5, PT_R5(sp)
LONG_L $4, PT_R4(sp)
LONG_L $2, PT_R2(sp)
#endif
STI STI
.set at .set at
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm/irqflags.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/regdef.h> #include <asm/regdef.h>
#include <asm/stackframe.h> #include <asm/stackframe.h>
...@@ -33,6 +34,7 @@ NESTED(handle_sys64, PT_SIZE, sp) ...@@ -33,6 +34,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
*/ */
.set noat .set noat
SAVE_SOME SAVE_SOME
TRACE_IRQS_ON
STI STI
.set at .set at
#endif #endif
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm/irqflags.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/regdef.h> #include <asm/regdef.h>
#include <asm/stackframe.h> #include <asm/stackframe.h>
...@@ -32,6 +33,7 @@ NESTED(handle_sysn32, PT_SIZE, sp) ...@@ -32,6 +33,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
#ifndef CONFIG_MIPS32_O32 #ifndef CONFIG_MIPS32_O32
.set noat .set noat
SAVE_SOME SAVE_SOME
TRACE_IRQS_ON
STI STI
.set at .set at
#endif #endif
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/asmmacro.h> #include <asm/asmmacro.h>
#include <asm/irqflags.h>
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/regdef.h> #include <asm/regdef.h>
#include <asm/stackframe.h> #include <asm/stackframe.h>
...@@ -27,6 +28,7 @@ ...@@ -27,6 +28,7 @@
NESTED(handle_sys, PT_SIZE, sp) NESTED(handle_sys, PT_SIZE, sp)
.set noat .set noat
SAVE_SOME SAVE_SOME
TRACE_IRQS_ON
STI STI
.set at .set at
ld t1, PT_EPC(sp) # skip syscall on return ld t1, PT_EPC(sp) # skip syscall on return
......
...@@ -96,6 +96,7 @@ FEXPORT(__smtc_ipi_vector) ...@@ -96,6 +96,7 @@ FEXPORT(__smtc_ipi_vector)
/* Save all will redundantly recompute the SP, but use it for now */ /* Save all will redundantly recompute the SP, but use it for now */
SAVE_ALL SAVE_ALL
CLI CLI
TRACE_IRQS_OFF
move a0,sp move a0,sp
/* Function to be invoked passed stack pad slot 5 */ /* Function to be invoked passed stack pad slot 5 */
lw t0,PT_PADSLOT5(sp) lw t0,PT_PADSLOT5(sp)
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#ifndef _ASM_ATOMIC_H #ifndef _ASM_ATOMIC_H
#define _ASM_ATOMIC_H #define _ASM_ATOMIC_H
#include <linux/irqflags.h>
#include <asm/cpu-features.h> #include <asm/cpu-features.h>
#include <asm/interrupt.h>
#include <asm/war.h> #include <asm/war.h>
typedef struct { volatile int counter; } atomic_t; typedef struct { volatile int counter; } atomic_t;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/interrupt.h> #include <linux/irqflags.h>
#include <asm/sgidefs.h> #include <asm/sgidefs.h>
#include <asm/war.h> #include <asm/war.h>
......
...@@ -8,13 +8,15 @@ ...@@ -8,13 +8,15 @@
* Copyright (C) 1999 Silicon Graphics * Copyright (C) 1999 Silicon Graphics
* Copyright (C) 2000 MIPS Technologies, Inc. * Copyright (C) 2000 MIPS Technologies, Inc.
*/ */
#ifndef _ASM_INTERRUPT_H #ifndef _ASM_IRQFLAGS_H
#define _ASM_INTERRUPT_H #define _ASM_IRQFLAGS_H
#ifndef __ASSEMBLY__
#include <asm/hazards.h> #include <asm/hazards.h>
__asm__ ( __asm__ (
" .macro local_irq_enable \n" " .macro raw_local_irq_enable \n"
" .set push \n" " .set push \n"
" .set reorder \n" " .set reorder \n"
" .set noat \n" " .set noat \n"
...@@ -35,10 +37,10 @@ __asm__ ( ...@@ -35,10 +37,10 @@ __asm__ (
" .set pop \n" " .set pop \n"
" .endm"); " .endm");
static inline void local_irq_enable(void) static inline void raw_local_irq_enable(void)
{ {
__asm__ __volatile__( __asm__ __volatile__(
"local_irq_enable" "raw_local_irq_enable"
: /* no outputs */ : /* no outputs */
: /* no inputs */ : /* no inputs */
: "memory"); : "memory");
...@@ -63,7 +65,7 @@ static inline void local_irq_enable(void) ...@@ -63,7 +65,7 @@ static inline void local_irq_enable(void)
* Workaround: mask EXL bit of the result or place a nop before mfc0. * Workaround: mask EXL bit of the result or place a nop before mfc0.
*/ */
__asm__ ( __asm__ (
" .macro local_irq_disable\n" " .macro raw_local_irq_disable\n"
" .set push \n" " .set push \n"
" .set noat \n" " .set noat \n"
#ifdef CONFIG_MIPS_MT_SMTC #ifdef CONFIG_MIPS_MT_SMTC
...@@ -84,17 +86,17 @@ __asm__ ( ...@@ -84,17 +86,17 @@ __asm__ (
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
static inline void local_irq_disable(void) static inline void raw_local_irq_disable(void)
{ {
__asm__ __volatile__( __asm__ __volatile__(
"local_irq_disable" "raw_local_irq_disable"
: /* no outputs */ : /* no outputs */
: /* no inputs */ : /* no inputs */
: "memory"); : "memory");
} }
__asm__ ( __asm__ (
" .macro local_save_flags flags \n" " .macro raw_local_save_flags flags \n"
" .set push \n" " .set push \n"
" .set reorder \n" " .set reorder \n"
#ifdef CONFIG_MIPS_MT_SMTC #ifdef CONFIG_MIPS_MT_SMTC
...@@ -105,13 +107,13 @@ __asm__ ( ...@@ -105,13 +107,13 @@ __asm__ (
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
#define local_save_flags(x) \ #define raw_local_save_flags(x) \
__asm__ __volatile__( \ __asm__ __volatile__( \
"local_save_flags %0" \ "raw_local_save_flags %0" \
: "=r" (x)) : "=r" (x))
__asm__ ( __asm__ (
" .macro local_irq_save result \n" " .macro raw_local_irq_save result \n"
" .set push \n" " .set push \n"
" .set reorder \n" " .set reorder \n"
" .set noat \n" " .set noat \n"
...@@ -135,15 +137,15 @@ __asm__ ( ...@@ -135,15 +137,15 @@ __asm__ (
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
#define local_irq_save(x) \ #define raw_local_irq_save(x) \
__asm__ __volatile__( \ __asm__ __volatile__( \
"local_irq_save\t%0" \ "raw_local_irq_save\t%0" \
: "=r" (x) \ : "=r" (x) \
: /* no inputs */ \ : /* no inputs */ \
: "memory") : "memory")
__asm__ ( __asm__ (
" .macro local_irq_restore flags \n" " .macro raw_local_irq_restore flags \n"
" .set push \n" " .set push \n"
" .set noreorder \n" " .set noreorder \n"
" .set noat \n" " .set noat \n"
...@@ -182,40 +184,42 @@ __asm__ ( ...@@ -182,40 +184,42 @@ __asm__ (
" .set pop \n" " .set pop \n"
" .endm \n"); " .endm \n");
#define local_irq_restore(flags) \ #define raw_local_irq_restore(flags) \
do { \ do { \
unsigned long __tmp1; \ unsigned long __tmp1; \
\ \
__asm__ __volatile__( \ __asm__ __volatile__( \
"local_irq_restore\t%0" \ "raw_local_irq_restore\t%0" \
: "=r" (__tmp1) \ : "=r" (__tmp1) \
: "0" (flags) \ : "0" (flags) \
: "memory"); \ : "memory"); \
} while(0) } while(0)
static inline int irqs_disabled(void) static inline int raw_irqs_disabled_flags(unsigned long flags)
{ {
#ifdef CONFIG_MIPS_MT_SMTC #ifdef CONFIG_MIPS_MT_SMTC
/* /*
* SMTC model uses TCStatus.IXMT to disable interrupts for a thread/CPU * SMTC model uses TCStatus.IXMT to disable interrupts for a thread/CPU
*/ */
unsigned long __result; return flags & 0x400;
__asm__ __volatile__(
" .set noreorder \n"
" mfc0 %0, $2, 1 \n"
" andi %0, 0x400 \n"
" slt %0, $0, %0 \n"
" .set reorder \n"
: "=r" (__result));
return __result;
#else #else
unsigned long flags;
local_save_flags(flags);
return !(flags & 1); return !(flags & 1);
#endif #endif
} }
#endif /* _ASM_INTERRUPT_H */ #endif
/*
* Do the CPU's IRQ-state tracing from assembly code.
*/
#ifdef CONFIG_TRACE_IRQFLAGS
# define TRACE_IRQS_ON \
jal trace_hardirqs_on
# define TRACE_IRQS_OFF \
jal trace_hardirqs_off
#else
# define TRACE_IRQS_ON
# define TRACE_IRQS_OFF
#endif
#endif /* _ASM_IRQFLAGS_H */
...@@ -1417,7 +1417,7 @@ change_c0_##name(unsigned int change, unsigned int new) \ ...@@ -1417,7 +1417,7 @@ change_c0_##name(unsigned int change, unsigned int new) \
#else /* SMTC versions that manage MT scheduling */ #else /* SMTC versions that manage MT scheduling */
#include <asm/interrupt.h> #include <linux/irqflags.h>
/* /*
* This is a duplicate of dmt() in mipsmtregs.h to avoid problems with * This is a duplicate of dmt() in mipsmtregs.h to avoid problems with
......
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
#define _ASM_SYSTEM_H #define _ASM_SYSTEM_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/irqflags.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/cpu-features.h> #include <asm/cpu-features.h>
#include <asm/dsp.h> #include <asm/dsp.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/war.h> #include <asm/war.h>
#include <asm/interrupt.h>
/* /*
* read_barrier_depends - Flush all pending reads that subsequents reads * read_barrier_depends - Flush all pending reads that subsequents reads
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment