From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425879AbcFHOTf (ORCPT ); Wed, 8 Jun 2016 10:19:35 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33972 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1425863AbcFHOTc (ORCPT ); Wed, 8 Jun 2016 10:19:32 -0400 Date: Wed, 8 Jun 2016 07:18:18 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: brgerst@gmail.com, ray.huang@amd.com, hpa@zytor.com, dvlasenk@redhat.com, tglx@linutronix.de, bp@suse.de, mingo@kernel.org, sherry.hurwitz@amd.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, bp@alien8.de, luto@amacapital.net, peterz@infradead.org Reply-To: dvlasenk@redhat.com, hpa@zytor.com, ray.huang@amd.com, brgerst@gmail.com, peterz@infradead.org, luto@amacapital.net, bp@alien8.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, sherry.hurwitz@amd.com, mingo@kernel.org, bp@suse.de, tglx@linutronix.de In-Reply-To: <1464775468-23355-1-git-send-email-bp@alien8.de> References: <1464775468-23355-1-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/cpu/AMD: Extend X86_FEATURE_TOPOEXT workaround to newer models Git-Commit-ID: 96685a55a82c383cbba7ef1d4a636acf708cf17f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 96685a55a82c383cbba7ef1d4a636acf708cf17f Gitweb: http://git.kernel.org/tip/96685a55a82c383cbba7ef1d4a636acf708cf17f Author: Borislav Petkov AuthorDate: Wed, 1 Jun 2016 12:04:28 +0200 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 13:51:34 +0200 x86/cpu/AMD: Extend X86_FEATURE_TOPOEXT workaround to newer models We need to reenable the topology extensions CPUID leafs on newer models too, if BIOS has disabled them, as we rely on them to get proper compute unit topology. Make the printk a once thing, while at it. Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Rui Huang Cc: Sherry Hurwitz Cc: Thomas Gleixner Cc: linux-hwmon@vger.kernel.org Link: http://lkml.kernel.org/r/1464775468-23355-1-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/amd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index c343a54..f5c69d8 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -674,14 +674,14 @@ static void init_amd_bd(struct cpuinfo_x86 *c) u64 value; /* re-enable TopologyExtensions if switched off by BIOS */ - if ((c->x86_model >= 0x10) && (c->x86_model <= 0x1f) && + if ((c->x86_model >= 0x10) && (c->x86_model <= 0x6f) && !cpu_has(c, X86_FEATURE_TOPOEXT)) { if (msr_set_bit(0xc0011005, 54) > 0) { rdmsrl(0xc0011005, value); if (value & BIT_64(54)) { set_cpu_cap(c, X86_FEATURE_TOPOEXT); - pr_info(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n"); + pr_info_once(FW_INFO "CPU: Re-enabling disabled Topology Extensions Support.\n"); } } }