diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-11-23 16:15:13 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-11-24 08:46:20 +0100 |
| commit | 4b5ff47d159872ef9e1096713fd68367f4640576 (patch) | |
| tree | 1d45361562faaac01ec00dcc1768fe4814a97252 /c | |
| parent | powerpc: Fix interrupt profiling for e6500 (diff) | |
| download | rtems-4b5ff47d159872ef9e1096713fd68367f4640576.tar.bz2 | |
score: Fix interrupt profiling
Callers of _Thread_Do_dispatch() must have a valid
Per_CPU_Control::Stats::thread_dispatch_disabled_instant.
Call _Profiling_Outer_most_interrupt_entry_and_exit() with the interrupt
stack to not exceed Per_CPU_Control::Interrupt_frame.
Update #2751.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S index 34777e556b..316237015e 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S +++ b/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S @@ -260,6 +260,9 @@ ppc_exc_wrap_async_normal: /* Increment ISR nest level and thread dispatch disable level */ cmpwi ISR_NEST_REGISTER, 0 +#ifdef RTEMS_PROFILING + cmpwi cr2, ISR_NEST_REGISTER, 0 +#endif addi ISR_NEST_REGISTER, ISR_NEST_REGISTER, 1 addi DISPATCH_LEVEL_REGISTER, DISPATCH_LEVEL_REGISTER, 1 stw ISR_NEST_REGISTER, PER_CPU_ISR_NEST_LEVEL(SELF_CPU_REGISTER) @@ -285,6 +288,16 @@ ppc_exc_wrap_async_normal: bl bsp_interrupt_dispatch #endif /* PPC_EXC_CONFIG_USE_FIXED_HANDLER */ +#ifdef RTEMS_PROFILING + /* Update profiling data if necessary */ + bne cr2, .Lprofiling_done + GET_SELF_CPU_CONTROL r3 + mr r4, ENTRY_INSTANT_REGISTER + GET_TIME_BASE r5 + bl _Profiling_Outer_most_interrupt_entry_and_exit +.Lprofiling_done: +#endif /* RTEMS_PROFILING */ + /* Load some per-CPU variables */ GET_SELF_CPU_CONTROL SELF_CPU_REGISTER lbz SCRATCH_0_REGISTER, PER_CPU_DISPATCH_NEEDED(SELF_CPU_REGISTER) @@ -304,37 +317,17 @@ ppc_exc_wrap_async_normal: or SCRATCH_0_REGISTER, SCRATCH_0_REGISTER, SCRATCH_1_REGISTER subi DISPATCH_LEVEL_REGISTER, SCRATCH_2_REGISTER, 1 or. SCRATCH_0_REGISTER, SCRATCH_0_REGISTER, DISPATCH_LEVEL_REGISTER -#ifdef RTEMS_PROFILING - cmpwi cr2, SCRATCH_0_REGISTER, 0 - subic. ISR_NEST_REGISTER, ISR_NEST_REGISTER, 1 -#else subi ISR_NEST_REGISTER, ISR_NEST_REGISTER, 1 -#endif /* Store thread dispatch disable and ISR nest levels */ stw DISPATCH_LEVEL_REGISTER, PER_CPU_THREAD_DISPATCH_DISABLE_LEVEL(SELF_CPU_REGISTER) stw ISR_NEST_REGISTER, PER_CPU_ISR_NEST_LEVEL(SELF_CPU_REGISTER) -#ifdef RTEMS_PROFILING - /* Store profiling data if necessary */ - bne .Lprofiling_done - mr r3, SELF_CPU_REGISTER - mr r4, ENTRY_INSTANT_REGISTER - GET_TIME_BASE r5 - bl _Profiling_Outer_most_interrupt_entry_and_exit - GET_SELF_CPU_CONTROL SELF_CPU_REGISTER -.Lprofiling_done: -#endif /* RTEMS_PROFILING */ - /* * Check thread dispatch necessary, ISR dispatch disable and thread * dispatch disable level. */ -#ifdef RTEMS_PROFILING - bne cr2, .Lthread_dispatch_done -#else bne .Lthread_dispatch_done -#endif /* Thread dispatch */ .Ldo_thread_dispatch: |