From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752522AbcFBAO6 (ORCPT ); Wed, 1 Jun 2016 20:14:58 -0400 Received: from mga04.intel.com ([192.55.52.120]:18121 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751901AbcFBAMQ (ORCPT ); Wed, 1 Jun 2016 20:12:16 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,403,1459839600"; d="scan'208";a="979083600" Subject: [PATCH 13/20] x86, cpufreq: use Intel family name macros for intel_pstate cpufreq driver To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Dave Hansen , dave.hansen@linux.intel.com, srinivas.pandruvada@linux.intel.com, lenb@kernel.org, rjw@rjwysocki.net, viresh.kumar@linaro.org, linux-pm@vger.kernel.org From: Dave Hansen Date: Wed, 01 Jun 2016 17:12:15 -0700 References: <20160602001157.D8BE59D7@viggo.jf.intel.com> In-Reply-To: <20160602001157.D8BE59D7@viggo.jf.intel.com> Message-Id: <20160602001215.771A0149@viggo.jf.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dave Hansen Another straightforward replacement of magic numbers. Signed-off-by: Dave Hansen Cc: Srinivas Pandruvada Cc: Len Brown Cc: "Rafael J. Wysocki" Cc: Viresh Kumar Cc: linux-pm@vger.kernel.org --- b/drivers/cpufreq/intel_pstate.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff -puN drivers/cpufreq/intel_pstate.c~x86-intel-families-cpufreq-pstate drivers/cpufreq/intel_pstate.c --- a/drivers/cpufreq/intel_pstate.c~x86-intel-families-cpufreq-pstate 2016-06-01 15:45:08.102122880 -0700 +++ b/drivers/cpufreq/intel_pstate.c 2016-06-01 15:45:08.106123062 -0700 @@ -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(str (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_MODEL_SANDYBRIDGE, core_params), + ICPU(INTEL_FAM6_MODEL_SANDYBRIDGE_X, core_params), + ICPU(INTEL_FAM6_MODEL_ATOM_SILVERMONT1, silvermont_params), + ICPU(INTEL_FAM6_MODEL_IVYBRIDGE, core_params), + ICPU(INTEL_FAM6_MODEL_HASWELL_CORE, core_params), + ICPU(INTEL_FAM6_MODEL_BROADWELL_CORE_M, core_params), + ICPU(INTEL_FAM6_MODEL_IVYBRIDGE_X, core_params), + ICPU(INTEL_FAM6_MODEL_HASWELL_X, core_params), + ICPU(INTEL_FAM6_MODEL_HASWELL_ULT, core_params), + ICPU(INTEL_FAM6_MODEL_HASWELL_GT3E, core_params), + ICPU(INTEL_FAM6_MODEL_BROADWELL_GT3E, core_params), + ICPU(INTEL_FAM6_MODEL_ATOM_AIRMONT, airmont_params), + ICPU(INTEL_FAM6_MODEL_SKYLAKE_MOBILE, core_params), + ICPU(INTEL_FAM6_MODEL_BROADWELL_X, core_params), + ICPU(INTEL_FAM6_MODEL_SKYLAKE_DESKTOP, core_params), + ICPU(INTEL_FAM6_MODEL_BROADWELL_XEON_D, core_params), + ICPU(INTEL_FAM6_MODEL_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_MODEL_BROADWELL_XEON_D, core_params), {} }; _