From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030620Ab2CNOGs (ORCPT ); Wed, 14 Mar 2012 10:06:48 -0400 Received: from mail1.windriver.com ([147.11.146.13]:59624 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754184Ab2CNOGq (ORCPT ); Wed, 14 Mar 2012 10:06:46 -0400 Message-ID: <4F60A5E5.1070709@windriver.com> Date: Wed, 14 Mar 2012 10:06:29 -0400 From: Paul Gortmaker User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.27) Gecko/20120216 Thunderbird/3.1.19 MIME-Version: 1.0 To: Boris Ostrovsky CC: , , Borislav Petkov , Andreas Herrmann , Greg Kroah-Hartman , Hans Rosenfeld , Nick Bowler , Joerg-Volker-Peetz , Ingo Molnar Subject: Re: [34-longterm 181/196] x86, AMD: Fix ARAT feature setting again References: <1331597724-31358-1-git-send-email-paul.gortmaker@windriver.com> <1331598109-31424-1-git-send-email-paul.gortmaker@windriver.com> <1331598109-31424-136-git-send-email-paul.gortmaker@windriver.com> <4F5F51E2.1090304@amd.com> In-Reply-To: <4F5F51E2.1090304@amd.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [128.224.146.65] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12-03-13 09:55 AM, Boris Ostrovsky wrote: > On 03/12/12 20:21, Paul Gortmaker wrote: >> From: Borislav Petkov >> >> ------------------- >> 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. It turns out that the e9cdd wants to apply on top of (vs instead of) the 14fb57dccb commit. So I will queue it directly after the 14fb57dcc commit. Thanks, Paul. > > -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 >> Cc: Boris Ostrovsky >> Cc: Andreas Herrmann >> Cc: Greg Kroah-Hartman >> Cc: Hans Rosenfeld >> Cc: Nick Bowler >> Cc: Joerg-Volker-Peetz >> Signed-off-by: Borislav Petkov >> Link: http://lkml.kernel.org/r/1305636919-31165-3-git-send-email-bp@amd64.org >> Signed-off-by: Ingo Molnar >> Signed-off-by: Paul Gortmaker >> --- >> 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); >> >> /* > >