From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425706AbcFHOQq (ORCPT ); Wed, 8 Jun 2016 10:16:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33708 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161480AbcFHOQo (ORCPT ); Wed, 8 Jun 2016 10:16:44 -0400 Date: Wed, 8 Jun 2016 07:15:35 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: viresh.kumar@linaro.org, peterz@infradead.org, dvlasenk@redhat.com, bp@alien8.de, srinivas.pandruvada@linux.intel.com, linux-kernel@vger.kernel.org, lenb@kernel.org, hpa@zytor.com, mingo@kernel.org, luto@amacapital.net, rjw@rjwysocki.net, dave.hansen@linux.intel.com, torvalds@linux-foundation.org, dave@sr71.net, brgerst@gmail.com, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, lenb@kernel.org, mingo@kernel.org, hpa@zytor.com, luto@amacapital.net, rjw@rjwysocki.net, dave.hansen@linux.intel.com, torvalds@linux-foundation.org, dave@sr71.net, brgerst@gmail.com, tglx@linutronix.de, viresh.kumar@linaro.org, peterz@infradead.org, dvlasenk@redhat.com, bp@alien8.de, srinivas.pandruvada@linux.intel.com In-Reply-To: <20160603001945.0F5D02AA@viggo.jf.intel.com> References: <20160603001945.0F5D02AA@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpu] x86/cpufreq: Use Intel family name macros for the intel_pstate cpufreq driver Git-Commit-ID: 5b20c944882ce35da0074b9eabe41a172aea030b 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: 5b20c944882ce35da0074b9eabe41a172aea030b Gitweb: http://git.kernel.org/tip/5b20c944882ce35da0074b9eabe41a172aea030b Author: Dave Hansen AuthorDate: Thu, 2 Jun 2016 17:19:45 -0700 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 13:03:26 +0200 x86/cpufreq: Use Intel family name macros for the intel_pstate cpufreq driver Another straightforward replacement of magic numbers. Signed-off-by: Dave Hansen Acked-by: Rafael J. Wysocki Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Len Brown Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Srinivas Pandruvada Cc: Thomas Gleixner Cc: Viresh Kumar Cc: jacob.jun.pan@intel.com Cc: linux-pm@vger.kernel.org Link: http://lkml.kernel.org/r/20160603001945.0F5D02AA@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- drivers/cpufreq/intel_pstate.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 0d159b5..9b1f5d7 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -35,6 +35,7 @@ #include #include #include +#include #define ATOM_RATIOS 0x66a #define ATOM_VIDS 0x66b @@ -1352,29 +1353,29 @@ static void intel_pstate_update_util(struct update_util_data *data, u64 time, (unsigned long)&policy } static const struct x86_cpu_id intel_pstate_cpu_ids[] = { - ICPU(0x2a, core_params), - ICPU(0x2d, core_params), - ICPU(0x37, silvermont_params), - ICPU(0x3a, core_params), - ICPU(0x3c, core_params), - ICPU(0x3d, core_params), - ICPU(0x3e, core_params), - ICPU(0x3f, core_params), - ICPU(0x45, core_params), - ICPU(0x46, core_params), - ICPU(0x47, core_params), - ICPU(0x4c, airmont_params), - ICPU(0x4e, core_params), - ICPU(0x4f, core_params), - ICPU(0x5e, core_params), - ICPU(0x56, core_params), - ICPU(0x57, knl_params), + ICPU(INTEL_FAM6_SANDYBRIDGE, core_params), + ICPU(INTEL_FAM6_SANDYBRIDGE_X, core_params), + ICPU(INTEL_FAM6_ATOM_SILVERMONT1, silvermont_params), + ICPU(INTEL_FAM6_IVYBRIDGE, core_params), + ICPU(INTEL_FAM6_HASWELL_CORE, core_params), + ICPU(INTEL_FAM6_BROADWELL_CORE, core_params), + ICPU(INTEL_FAM6_IVYBRIDGE_X, core_params), + ICPU(INTEL_FAM6_HASWELL_X, core_params), + ICPU(INTEL_FAM6_HASWELL_ULT, core_params), + ICPU(INTEL_FAM6_HASWELL_GT3E, core_params), + ICPU(INTEL_FAM6_BROADWELL_GT3E, core_params), + ICPU(INTEL_FAM6_ATOM_AIRMONT, airmont_params), + ICPU(INTEL_FAM6_SKYLAKE_MOBILE, core_params), + ICPU(INTEL_FAM6_BROADWELL_X, core_params), + ICPU(INTEL_FAM6_SKYLAKE_DESKTOP, core_params), + ICPU(INTEL_FAM6_BROADWELL_XEON_D, core_params), + ICPU(INTEL_FAM6_XEON_PHI_KNL, knl_params), {} }; MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids); static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] = { - ICPU(0x56, core_params), + ICPU(INTEL_FAM6_BROADWELL_XEON_D, core_params), {} };