Re: [34-longterm 181/196] x86, AMD: Fix ARAT feature setting again

[Boris Ostrovsky]

On 03/12/12 20:21, Paul Gortmaker wrote:
> From: Borislav Petkov<borislav.petkov@xxxxxxx>
>
>                     -------------------
>      This is a commit scheduled for the next v2.6.34 longterm release.
>      If you see a problem with using this for longterm, please comment.


Paul, please use e9cdd343a5e42c43bcda01e609fa23089e026470 instead of the 
one below.

-boris

>                     -------------------
>
> commit 14fb57dccb6e1defe9f89a66f548fcb24c374c1d upstream.
>
> Trying to enable the local APIC timer on early K8 revisions
> uncovers a number of other issues with it, in conjunction with
> the C1E enter path on AMD. Fixing those causes much more churn
> and troubles than the benefit of using that timer brings so
> don't enable it on K8 at all, falling back to the original
> functionality the kernel had wrt to that.
>
> Reported-and-bisected-by: Nick Bowler<nbowler@xxxxxxxxxxxxxxxx>
> Cc: Boris Ostrovsky<Boris.Ostrovsky@xxxxxxx>
> Cc: Andreas Herrmann<andreas.herrmann3@xxxxxxx>
> Cc: Greg Kroah-Hartman<greg@xxxxxxxxx>
> Cc: Hans Rosenfeld<hans.rosenfeld@xxxxxxx>
> Cc: Nick Bowler<nbowler@xxxxxxxxxxxxxxxx>
> Cc: Joerg-Volker-Peetz<jvpeetz@xxxxxx>
> Signed-off-by: Borislav Petkov<borislav.petkov@xxxxxxx>
> Link: http://lkml.kernel.org/r/1305636919-31165-3-git-send-email-bp@xxxxxxxxx
> Signed-off-by: Ingo Molnar<mingo@xxxxxxx>
> Signed-off-by: Paul Gortmaker<paul.gortmaker@xxxxxxxxxxxxx>
> ---
>   arch/x86/kernel/cpu/amd.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index d618dc1..76a7f76 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -567,7 +567,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
>   #endif
>
>   	/* As a rule processors have APIC timer running in deep C states */
> -	if (c->x86>= 0xf&&  !cpu_has_amd_erratum(amd_erratum_400))
> +	if (c->x86>  0xf&&  !cpu_has_amd_erratum(amd_erratum_400))
>   		set_cpu_cap(c, X86_FEATURE_ARAT);
>
>   	/*


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/