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, adrian.hunter@intel.com,
ak@linux.intel.com, luto@kernel.org, bp@alien8.de,
dvhart@infradead.org, dougthompson@xmission.com,
edubezval@gmail.com, hpa@zytor.com, mingo@redhat.com,
jacob.jun.pan@linux.intel.com, kan.liang@intel.com,
lenb@kernel.org, linux-acpi@vger.kernel.org,
linux-edac@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-pm@vger.kernel.org, mchehab@osg.samsung.com,
peterz@infradead.org, platform-driver-x86@vger.kernel.org,
rafael.j.wysocki@intel.com, rajneesh.bhardwaj@intel.com,
souvik.k.chakravarty@intel.com,
srinivas.pandruvada@linux.intel.com, eranian@google.com,
tglx@linutronix.de, tony.luck@intel.com, ulf.hansson@linaro.org,
viresh.kumar@linaro.org, vishwanath.somayaji@intel.com,
zheng.z.yan@intel.com, rui.zhang@intel.com
Subject: [PATCH 01/20] x86, intel: Introduce macros for Intel family numbers
Date: Wed, 01 Jun 2016 17:11:57 -0700 [thread overview]
Message-ID: <20160602001157.D8BE59D7@viggo.jf.intel.com> (raw)
From: Dave Hansen <dave.hansen@linux.intel.com>
If you are cc'd on this code, please check _your_ code vs. the
model list in "intel-family.h". Please make sure you have all
the models listed that you intend to.
Problem:
We have a boatload of open-coded family-6 model numbers. Half of
them have these model numbers in hex and the other half in
decimal. This makes grepping for them tons of fun, if you were
to try.
Solution:
Consolidate all the magic numbers. Put all the definitions in
one header.
The names here are closely derived from the comments describing
the models from arch/x86/events/intel/core.c. We could easily
make them shorter by doing things like s/SANDYBRIDGE/SNB/, but
they seemed fine even with the longer versions to me.
Do not take any of these names too literally, like "DESKTOP"
or "MOBILE". These are all colloquial names and not precise
descriptions of everywhere a given model will show up.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
Cc: linux-edac@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: platform-driver-x86@vger.kernel.org
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>
Cc: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Vishwanath Somayaji <vishwanath.somayaji@intel.com>
Cc: Yan, Zheng <zheng.z.yan@intel.com>
Cc: Zhang Rui <rui.zhang@intel.com>
---
b/arch/x86/include/asm/intel-family.h | 57 ++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff -puN /dev/null arch/x86/include/asm/intel-family.h
--- /dev/null 2016-04-04 09:40:43.435149254 -0700
+++ b/arch/x86/include/asm/intel-family.h 2016-06-01 15:45:02.877884645 -0700
@@ -0,0 +1,57 @@
+#ifndef _ASM_X86_INTEL_FAMILY_H
+#define _ASM_X86_INTEL_FAMILY_H
+
+/*
+ * "Big Core" Processors (Branded as Core, Xeon, etc...)
+ *
+ * The "_X" parts are generally the EP and EX Xeons, or the
+ * "Extreme" ones, like Broadwell-E.
+ */
+
+#define INTEL_FAM6_MODEL_CORE_YONAH 0x0E
+#define INTEL_FAM6_MODEL_CORE2_MEROM 0x0F
+#define INTEL_FAM6_MODEL_CORE2_MEROM_L 0x16
+#define INTEL_FAM6_MODEL_CORE2_PENRYN 0x17
+#define INTEL_FAM6_MODEL_CORE2_DUNNINGTON 0x1D
+#define INTEL_FAM6_MODEL_NEHALEM 0x1E
+#define INTEL_FAM6_MODEL_NEHALEM_EP 0x1A
+#define INTEL_FAM6_MODEL_NEHALEM_EX 0x2E
+#define INTEL_FAM6_MODEL_WESTMERE 0x25
+#define INTEL_FAM6_MODEL_WESTMERE_EP 0x2C
+#define INTEL_FAM6_MODEL_WESTMERE_EX 0x2F
+#define INTEL_FAM6_MODEL_SANDYBRIDGE 0x2A
+#define INTEL_FAM6_MODEL_SANDYBRIDGE_X 0x2D
+#define INTEL_FAM6_MODEL_IVYBRIDGE 0x3A
+#define INTEL_FAM6_MODEL_IVYBRIDGE_X 0x3E
+#define INTEL_FAM6_MODEL_HASWELL_CORE 0x3C
+#define INTEL_FAM6_MODEL_HASWELL_X 0x3F
+#define INTEL_FAM6_MODEL_HASWELL_ULT 0x45
+#define INTEL_FAM6_MODEL_HASWELL_GT3E 0x46
+#define INTEL_FAM6_MODEL_BROADWELL_CORE_M 0x3D
+#define INTEL_FAM6_MODEL_BROADWELL_XEON_D 0x56
+#define INTEL_FAM6_MODEL_BROADWELL_GT3E 0x47
+#define INTEL_FAM6_MODEL_BROADWELL_X 0x4F
+#define INTEL_FAM6_MODEL_SKYLAKE_MOBILE 0x4E
+#define INTEL_FAM6_MODEL_SKYLAKE_DESKTOP 0x5E
+#define INTEL_FAM6_MODEL_SKYLAKE_X 0x55
+#define INTEL_FAM6_MODEL_KABYLAKE_MOBILE 0x8E
+#define INTEL_FAM6_MODEL_KABYLAKE_DESKTOP 0x9E
+
+/* "Small Core" Processors (Atom) */
+
+#define INTEL_FAM6_MODEL_ATOM_PINEVIEW 0x1C
+#define INTEL_FAM6_MODEL_ATOM_LINCROFT 0x26
+#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_SILVERMONT1 0x37
+#define INTEL_FAM6_MODEL_ATOM_SILVERMONT2 0x4D /* Avaton/Rangely */
+#define INTEL_FAM6_MODEL_ATOM_AIRMONT 0x4C
+#define INTEL_FAM6_MODEL_ATOM_GOLDMONT 0x5C
+#define INTEL_FAM6_MODEL_ATOM_DENVERTON 0x5F /* Goldmont Microserver */
+
+/* Xeon Phi */
+
+#define INTEL_FAM6_MODEL_XEON_PHI_KNL 0x57 /* Knights Landing */
+
+#endif /* _ASM_X86_INTEL_FAMILY_H */
_
next reply other threads:[~2016-06-02 0:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-02 0:11 Dave Hansen [this message]
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 ` [PATCH 07/20] x86, intel: use Intel model macros intead of open-coding Dave Hansen
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
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=20160602001157.D8BE59D7@viggo.jf.intel.com \
--to=dave@sr71.net \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=dougthompson@xmission.com \
--cc=dvhart@infradead.org \
--cc=edubezval@gmail.com \
--cc=eranian@google.com \
--cc=hpa@zytor.com \
--cc=jacob.jun.pan@linux.intel.com \
--cc=kan.liang@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rajneesh.bhardwaj@intel.com \
--cc=rui.zhang@intel.com \
--cc=souvik.k.chakravarty@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=ulf.hansson@linaro.org \
--cc=viresh.kumar@linaro.org \
--cc=vishwanath.somayaji@intel.com \
--cc=x86@kernel.org \
--cc=zheng.z.yan@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).