From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1945922AbcFHOS1 (ORCPT ); Wed, 8 Jun 2016 10:18:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33864 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422831AbcFHOSY (ORCPT ); Wed, 8 Jun 2016 10:18:24 -0400 Date: Wed, 8 Jun 2016 07:17:20 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: hpa@zytor.com, brgerst@gmail.com, tglx@linutronix.de, bp@alien8.de, dave@sr71.net, torvalds@linux-foundation.org, mingo@kernel.org, dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, rui.zhang@intel.com, edubezval@gmail.com, dvlasenk@redhat.com, luto@amacapital.net Reply-To: brgerst@gmail.com, hpa@zytor.com, bp@alien8.de, tglx@linutronix.de, dave@sr71.net, torvalds@linux-foundation.org, mingo@kernel.org, dave.hansen@linux.intel.com, peterz@infradead.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, edubezval@gmail.com, rui.zhang@intel.com, luto@amacapital.net In-Reply-To: <20160603001952.9B6E114D@viggo.jf.intel.com> References: <20160603001952.9B6E114D@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86, thermal: Clean up and fix CPU model detection for intel_soc_dts_thermal Git-Commit-ID: ce53da02ebfbe93ec58dd6150b28b4606330ead5 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: ce53da02ebfbe93ec58dd6150b28b4606330ead5 Gitweb: http://git.kernel.org/tip/ce53da02ebfbe93ec58dd6150b28b4606330ead5 Author: Dave Hansen AuthorDate: Thu, 2 Jun 2016 17:19:52 -0700 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 13:03:26 +0200 x86, thermal: Clean up and fix CPU model detection for intel_soc_dts_thermal The X86_FAMILY_ANY in here is bogus. "BYT" and model 0x37 are family-6 only. Signed-off-by: Dave Hansen Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: Eduardo Valentin Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Zhang Rui Cc: jacob.jun.pan@intel.com Cc: linux-pm@vger.kernel.org Link: http://lkml.kernel.org/r/20160603001952.9B6E114D@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- drivers/thermal/intel_soc_dts_thermal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/intel_soc_dts_thermal.c b/drivers/thermal/intel_soc_dts_thermal.c index 4ebb31a3..b2bbaa1 100644 --- a/drivers/thermal/intel_soc_dts_thermal.c +++ b/drivers/thermal/intel_soc_dts_thermal.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "intel_soc_dts_iosf.h" #define CRITICAL_OFFSET_FROM_TJ_MAX 5000 @@ -42,7 +43,8 @@ static irqreturn_t soc_irq_thread_fn(int irq, void *dev_data) } static const struct x86_cpu_id soc_thermal_ids[] = { - { X86_VENDOR_INTEL, X86_FAMILY_ANY, 0x37, 0, BYT_SOC_DTS_APIC_IRQ}, + { X86_VENDOR_INTEL, 6, INTEL_FAM6_ATOM_SILVERMONT1, 0, + BYT_SOC_DTS_APIC_IRQ}, {} }; MODULE_DEVICE_TABLE(x86cpu, soc_thermal_ids);