[PATCH] x86: apic: disarm apic timer in deadline mode when shut down clockevent

[PATCH] x86: apic: disarm apic timer in deadline mode when shut down clockevent

[Wang, Biao]

For tsc deadline mode, when we shut down clockevent we should disarm
local-APIC timer like count-down mode.

Signed-off-by: wang, biao <biao.wang@intel.com>
Signed-off-by: Zhang Di <di.zhang@intel.com>
---
 arch/x86/kernel/apic/apic.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 7f26c9a..85889ba 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -512,6 +512,10 @@ static void lapic_timer_setup(enum clock_event_mode mode,
 		v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
 		apic_write(APIC_LVTT, v);
 		apic_write(APIC_TMICT, 0);
+
+		/*disarm timer in deadline mode*/
+		if (boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER))
+			wrmsrl(MSR_IA32_TSC_DEADLINE, 0);
 		break;
 	case CLOCK_EVT_MODE_RESUME:
 		/* Nothing to do here */
-- 
1.7.6

Re: [PATCH] x86: apic: disarm apic timer in deadline mode when shut down clockevent

[Ingo Molnar]

* Wang, Biao <biao.wang@intel.com> wrote:

> For tsc deadline mode, when we shut down clockevent we should disarm
> local-APIC timer like count-down mode.
> 
> Signed-off-by: wang, biao <biao.wang@intel.com>
> Signed-off-by: Zhang Di <di.zhang@intel.com>
> ---
>  arch/x86/kernel/apic/apic.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
> index 7f26c9a..85889ba 100644
> --- a/arch/x86/kernel/apic/apic.c
> +++ b/arch/x86/kernel/apic/apic.c
> @@ -512,6 +512,10 @@ static void lapic_timer_setup(enum clock_event_mode mode,
>  		v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
>  		apic_write(APIC_LVTT, v);
>  		apic_write(APIC_TMICT, 0);
> +
> +		/*disarm timer in deadline mode*/
> +		if (boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER))
> +			wrmsrl(MSR_IA32_TSC_DEADLINE, 0);
>  		break;

Please fix the changelog to conform to the standard changelog style:

 - first describe the symptoms of the bug - how does a user notice?

 - then describe how the code behaves today and how that is causing the bug

 - and then only describe how it's fixed.

The first item is the most important one - while developers 
(naturally) tend to concentrate on the least important point,
the last one.

Thanks,

        Ingo