diff options
| author | Andrew Boie <andrew.p.boie@intel.com> | 2016-09-26 13:15:58 -0700 |
|---|---|---|
| committer | Andrew Boie <andrew.p.boie@intel.com> | 2016-09-28 20:28:07 +0000 |
| commit | 70d8a327405f8c9bd6030c5bf989a5fe49b1d83a (patch) | |
| tree | 4f250741a842b7f655749ecbe9a231a4457f840a /arch | |
| parent | e56f61f5aa41c5a0c2d7dda9e61932ff46b9128e (diff) | |
x86: interrupts: consolidate duplicated code in idle path
Change-Id: I16b80f363fef17d3ea99fec0ced4f49238f8e6c7
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/core/intstub.S | 73 |
1 files changed, 28 insertions, 45 deletions
diff --git a/arch/x86/core/intstub.S b/arch/x86/core/intstub.S index cce06fc23..c2821a23b 100644 --- a/arch/x86/core/intstub.S +++ b/arch/x86/core/intstub.S @@ -228,9 +228,10 @@ SECTION_FUNC(TEXT, _interrupt_enter) #ifdef CONFIG_SYS_POWER_MANAGEMENT cmpl $0, __tNANO_idle_OFFSET(%ecx) - jne _HandleIdle + jne handle_idle /* fast path is !idle, in the pipeline */ -#endif +#endif /* CONFIG_SYS_POWER_MANAGEMENT */ + #ifdef CONFIG_DEBUG_INFO jmp alreadyOnIntStack @@ -266,49 +267,6 @@ alreadyOnIntStack: /* Discard ISR argument */ addl $0x4, %esp #endif - jmp interrupt_done - -#ifdef CONFIG_SYS_POWER_MANAGEMENT -_HandleIdle: - pushl %eax - pushl %edx -#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) - call _power_save_idle_exit -#else - push __tNANO_idle_OFFSET(%ecx) - movl $0, __tNANO_idle_OFFSET(%ecx) - - /* - * Beware that a timer driver's _sys_power_save_idle_exit() implementation might - * expect that interrupts are disabled when invoked. This ensures that - * the calculation and programming of the device for the next timer - * deadline is not interrupted. - */ - - call _sys_power_save_idle_exit - add $0x4, %esp -#endif /* CONFIG_NANOKERNEL && CONFIG_TICKLESS_IDLE */ -#ifdef CONFIG_INT_LATENCY_BENCHMARK - call _int_latency_stop -#endif - popl %edx -#ifdef CONFIG_X86_IAMCU - /* For Sys V case, we want EAX's value on the stack anyway as the arg - * to the ISR, so don't pop it - */ - popl %eax -#endif -#if CONFIG_NESTED_INTERRUPTS - sti /* re-enable interrupts */ -#endif - call *%edx -#ifndef CONFIG_X86_IAMCU - /* Discard ISR argument */ - addl $0x4, %esp -#endif -#endif /* CONFIG_SYS_POWER_MANAGEMENT */ - -interrupt_done: #ifdef CONFIG_NESTED_INTERRUPTS cli /* disable interrupts again */ #endif @@ -485,6 +443,31 @@ nestedInterrupt: iret +#ifdef CONFIG_SYS_POWER_MANAGEMENT +handle_idle: + pushl %eax + pushl %edx +#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) + call _power_save_idle_exit +#else + push __tNANO_idle_OFFSET(%ecx) + movl $0, __tNANO_idle_OFFSET(%ecx) + + /* + * Beware that a timer driver's _sys_power_save_idle_exit() implementation might + * expect that interrupts are disabled when invoked. This ensures that + * the calculation and programming of the device for the next timer + * deadline is not interrupted. + */ + + call _sys_power_save_idle_exit + add $0x4, %esp +#endif /* CONFIG_NANOKERNEL && CONFIG_TICKLESS_IDLE */ + popl %edx + popl %eax + jmp alreadyOnIntStack +#endif /* CONFIG_SYS_POWER_MANAGEMENT */ + /** * * _SpuriousIntHandler - |