Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14fb57dc authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86, AMD: Fix ARAT feature setting again 



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: default avatarNick Bowler <nbowler@elliptictech.com>
Cc: Boris Ostrovsky <Boris.Ostrovsky@amd.com>
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Greg Kroah-Hartman <greg@kroah.com>
Cc: Hans Rosenfeld <hans.rosenfeld@amd.com>
Cc: Nick Bowler <nbowler@elliptictech.com>
Cc: Joerg-Volker-Peetz <jvpeetz@web.de>
Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Link: http://lkml.kernel.org/r/1305636919-31165-3-git-send-email-bp@amd64.org


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 328935e6

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -613,7 +613,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);



	/*