From: Dave Hansen <dave@sr71.net>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, Dave Hansen <dave@sr71.net>,
dave.hansen@linux.intel.com, rjw@rjwysocki.net,
linux-pm@vger.kernel.org
Subject: [PATCH 07/20] x86, intel: use Intel model macros intead of open-coding
Date: Wed, 01 Jun 2016 17:12:07 -0700 [thread overview]
Message-ID: <20160602001207.EC723977@viggo.jf.intel.com> (raw)
In-Reply-To: <20160602001157.D8BE59D7@viggo.jf.intel.com>
From: Dave Hansen <dave.hansen@linux.intel.com>
Use the new macros to remove another large set of open-coded values.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: linux-pm@vger.kernel.org
---
b/arch/x86/include/asm/intel-family.h | 4 ++-
b/drivers/powercap/intel_rapl.c | 43 +++++++++++++++++-----------------
2 files changed, 25 insertions(+), 22 deletions(-)
diff -puN arch/x86/include/asm/intel-family.h~x86-intel-familites-powercap-rapl arch/x86/include/asm/intel-family.h
--- a/arch/x86/include/asm/intel-family.h~x86-intel-familites-powercap-rapl 2016-06-01 15:45:05.485003534 -0700
+++ b/arch/x86/include/asm/intel-family.h 2016-06-01 15:45:05.490003762 -0700
@@ -48,10 +48,12 @@
#define INTEL_FAM6_MODEL_ATOM_PENWELL 0x27
#define INTEL_FAM6_MODEL_ATOM_CLOVERVIEW 0x35
#define INTEL_FAM6_MODEL_ATOM_CEDARVIEW 0x36
+#define INTEL_FAM6_MODEL_ATOM_MERRIFIELD1 0x4A /* Tangier */
+#define INTEL_FAM6_MODEL_ATOM_MERRIFIELD2 0x5A /* Annidale */
#define INTEL_FAM6_MODEL_ATOM_SILVERMONT1 0x37 /* BayTrail/BYT */
#define INTEL_FAM6_MODEL_ATOM_SILVERMONT2 0x4D /* Avaton/Rangely */
#define INTEL_FAM6_MODEL_ATOM_AIRMONT 0x4C /* CherryTrail */
-#define INTEL_FAM6_MODEL_ATOM_GOLDMONT 0x5C
+#define INTEL_FAM6_MODEL_ATOM_GOLDMONT 0x5C /* Broxton */
#define INTEL_FAM6_MODEL_ATOM_DENVERTON 0x5F /* Goldmont Microserver */
/* Xeon Phi */
diff -puN drivers/powercap/intel_rapl.c~x86-intel-familites-powercap-rapl drivers/powercap/intel_rapl.c
--- a/drivers/powercap/intel_rapl.c~x86-intel-familites-powercap-rapl 2016-06-01 15:45:05.486003580 -0700
+++ b/drivers/powercap/intel_rapl.c 2016-06-01 15:45:05.490003762 -0700
@@ -33,6 +33,7 @@
#include <asm/processor.h>
#include <asm/cpu_device_id.h>
+#include <asm/intel-family.h>
/* Local defines */
#define MSR_PLATFORM_POWER_LIMIT 0x0000065C
@@ -1096,27 +1097,27 @@ static const struct rapl_defaults rapl_d
}
static const struct x86_cpu_id rapl_ids[] __initconst = {
- RAPL_CPU(0x2a, rapl_defaults_core),/* Sandy Bridge */
- RAPL_CPU(0x2d, rapl_defaults_core),/* Sandy Bridge EP */
- RAPL_CPU(0x37, rapl_defaults_byt),/* Valleyview */
- RAPL_CPU(0x3a, rapl_defaults_core),/* Ivy Bridge */
- RAPL_CPU(0x3c, rapl_defaults_core),/* Haswell */
- RAPL_CPU(0x3d, rapl_defaults_core),/* Broadwell */
- RAPL_CPU(0x3f, rapl_defaults_hsw_server),/* Haswell servers */
- RAPL_CPU(0x4f, rapl_defaults_hsw_server),/* Broadwell servers */
- RAPL_CPU(0x45, rapl_defaults_core),/* Haswell ULT */
- RAPL_CPU(0x46, rapl_defaults_core),/* Haswell */
- RAPL_CPU(0x47, rapl_defaults_core),/* Broadwell-H */
- RAPL_CPU(0x4E, rapl_defaults_core),/* Skylake */
- RAPL_CPU(0x4C, rapl_defaults_cht),/* Braswell/Cherryview */
- RAPL_CPU(0x4A, rapl_defaults_tng),/* Tangier */
- RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */
- RAPL_CPU(0x5A, rapl_defaults_ann),/* Annidale */
- RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */
- RAPL_CPU(0x5E, rapl_defaults_core),/* Skylake-H/S */
- RAPL_CPU(0x57, rapl_defaults_hsw_server),/* Knights Landing */
- RAPL_CPU(0x8E, rapl_defaults_core),/* Kabylake */
- RAPL_CPU(0x9E, rapl_defaults_core),/* Kabylake */
+ RAPL_CPU(INTEL_FAM6_MODEL_SANDYBRIDGE, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_SANDYBRIDGE_X, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_ATOM_SILVERMONT1, rapl_defaults_byt),
+ RAPL_CPU(INTEL_FAM6_MODEL_IVYBRIDGE, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_CORE, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_CORE_M, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_X, rapl_defaults_hsw_server),
+ RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_X, rapl_defaults_hsw_server),
+ RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_ULT, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_GT3E, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_GT3E, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_MOBILE, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_ATOM_AIRMONT, rapl_defaults_cht),
+ RAPL_CPU(INTEL_FAM6_MODEL_ATOM_MERRIFIELD1, rapl_defaults_tng),
+ RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_XEON_D, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_ATOM_MERRIFIELD2, rapl_defaults_ann),
+ RAPL_CPU(INTEL_FAM6_MODEL_ATOM_GOLDMONT, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_DESKTOP, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_XEON_PHI_KNL, rapl_defaults_hsw_server),
+ RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_MOBILE, rapl_defaults_core),
+ RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_DESKTOP, rapl_defaults_core),
{}
};
MODULE_DEVICE_TABLE(x86cpu, rapl_ids);
_
next prev parent reply other threads:[~2016-06-02 0:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-02 0:11 [PATCH 01/20] x86, intel: Introduce macros for Intel family numbers Dave Hansen
2016-06-02 0:12 ` [PATCH 02/20] x86, perf: use Intel family macros for core perf events Dave Hansen
2016-06-02 0:12 ` [PATCH 03/20] x86, rapl: use Intel family macros for rapl Dave Hansen
2016-06-02 0:12 ` [PATCH 04/20] x86, intel_idle: use Intel family macros for intel_idle Dave Hansen
2016-06-02 0:12 ` [PATCH 05/20] x86, msr: use Intel family macros for msr events code Dave Hansen
2016-06-02 0:12 ` [PATCH 06/20] x86, msr: add missing Intel models Dave Hansen
2016-06-02 0:12 ` Dave Hansen [this message]
2016-06-02 0:12 ` [PATCH 08/20] x86, rapl: reorder cpu detection table Dave Hansen
2016-06-02 0:12 ` [PATCH 09/20] x86, platform: use new Intel model number macros Dave Hansen
2016-06-02 0:12 ` [PATCH 10/20] x86, cstate: use Intel Model name macros Dave Hansen
2016-06-02 0:12 ` [PATCH 11/20] x86, uncore: use Intel family name macros for uncore Dave Hansen
2016-06-02 0:12 ` [PATCH 12/20] x86, edac: use Intel family name macros for edac driver Dave Hansen
2016-06-02 16:16 ` Luck, Tony
2016-06-02 17:27 ` Luck, Tony
2016-06-02 0:12 ` [PATCH 13/20] x86, cpufreq: use Intel family name macros for intel_pstate cpufreq driver Dave Hansen
2016-06-02 0:12 ` [PATCH 14/20] x86, acpi, lss: use Intel family name macros for lpss driver Dave Hansen
2016-06-02 0:12 ` [PATCH 15/20] x86, intel_telemetry: use Intel family name macros for telemetry driver Dave Hansen
2016-06-02 0:12 ` [PATCH 16/20] x86, pmc_core: use Intel family name macros for pmc_core driver Dave Hansen
2016-06-02 0:12 ` [PATCH 17/20] x86, mmc: use Intel family name macros for mmc driver Dave Hansen
2016-06-02 6:08 ` Adrian Hunter
2016-06-03 7:42 ` Ulf Hansson
2016-06-02 0:12 ` [PATCH 18/20] x86, thermal: clean up and fix cpu model detection for intel_soc_dts_thermal Dave Hansen
2016-06-02 0:12 ` [PATCH 19/20] x86, rapl: add Skylake server model detection Dave Hansen
2016-06-02 0:12 ` [PATCH 20/20] x86, powercap, rapl: add Skylake Server model number Dave Hansen
2016-06-02 6:57 ` [PATCH 01/20] x86, intel: Introduce macros for Intel family numbers Borislav Petkov
2016-06-02 21:49 ` Rafael J. Wysocki
2016-06-02 21:45 ` Darren Hart
-- strict thread matches above, loose matches on Subject: below --
2016-06-03 0:19 [PATCH 01/20] [v2] " Dave Hansen
2016-06-03 0:19 ` [PATCH 07/20] x86, intel: use Intel model macros intead of open-coding Dave Hansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160602001207.EC723977@viggo.jf.intel.com \
--to=dave@sr71.net \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox