linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot2 for Peter Zijlstra <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
	Borislav Petkov <bp@alien8.de>,
	Dave Hansen <dave.hansen@intel.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Tony Luck <tony.luck@intel.com>, Ingo Molnar <mingo@kernel.org>,
	linux-kernel@vger.kernel.org
Subject: [tip: x86/cpu] x86/cpu/intel: Add common OPTDIFFs
Date: Mon, 26 Aug 2019 11:46:14 -0000	[thread overview]
Message-ID: <156681997452.3429.12466739291110092548.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20190822102411.393701010@infradead.org>

The following commit has been merged into the x86/cpu branch of tip:

Commit-ID:     b95a1e89f1007dd552d9756c077bedc74183d8ac
Gitweb:        https://git.kernel.org/tip/b95a1e89f1007dd552d9756c077bedc74183d8ac
Author:        Peter Zijlstra <peterz@infradead.org>
AuthorDate:    Thu, 22 Aug 2019 12:23:11 +02:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Mon, 26 Aug 2019 11:49:04 +02:00

x86/cpu/intel: Add common OPTDIFFs

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/20190822102411.393701010@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/intel-family.h | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 76dc9ab..5c05b2d 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -5,9 +5,6 @@
 /*
  * "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, or Atom microserver.
- *
  * While adding a new CPUID for a new microarchitecture, add a new
  * group to keep logically sorted out in chronological order. Within
  * that group keep the CPUID for the variants sorted by model number.
@@ -21,9 +18,19 @@
  * MICROARCH	Is the code name for the micro-architecture for this core.
  *		N.B. Not the platform name.
  * OPTDIFF	If needed, a short string to differentiate by market segment.
- *		Exact strings here will vary over time. _DESKTOP, _MOBILE, and
- *		_X (short for Xeon server) should be used when they are
- *		appropriate.
+ *
+ *		Common OPTDIFFs:
+ *
+ *			- regular client parts
+ *		_L	- regular mobile parts
+ *		_G	- parts with extra graphics on
+ *		_X	- regular server parts
+ *		_D	- micro server parts
+ *
+ *		Historical OPTDIFFs:
+ *
+ *		_EP	- 2 socket server parts
+ *		_EX	- 4+ socket server parts
  *
  * The #define line may optionally include a comment including platform names.
  */
@@ -91,6 +98,8 @@
 
 #define INTEL_FAM6_ATOM_GOLDMONT	0x5C /* Apollo Lake */
 #define INTEL_FAM6_ATOM_GOLDMONT_D	0x5F /* Denverton */
+
+/* Note: the micro-architecture is "Goldmont Plus" */
 #define INTEL_FAM6_ATOM_GOLDMONT_PLUS	0x7A /* Gemini Lake */
 
 #define INTEL_FAM6_ATOM_TREMONT_D	0x86 /* Jacobsville */

  reply	other threads:[~2019-08-26 11:46 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-22 10:23 [PATCH 0/5] Further sanitize INTEL_FAM6 naming Peter Zijlstra
2019-08-22 10:23 ` [PATCH 1/5] x86/intel: Aggregate big core client naming Peter Zijlstra
2019-08-26 11:46   ` [tip: x86/cpu] x86/cpu/intel: " tip-bot2 for Peter Zijlstra
2019-08-27  1:52     ` kbuild test robot
2019-08-22 10:23 ` [PATCH 2/5] x86/intel: Aggregate big core modile naming Peter Zijlstra
2019-08-26 11:46   ` [tip: x86/cpu] x86/cpu/intel: Aggregate big core mobile naming tip-bot2 for Peter Zijlstra
2019-08-22 10:23 ` [PATCH 3/5] x86/intel: Aggregate big core graphics naming Peter Zijlstra
2019-08-26 11:46   ` [tip: x86/cpu] x86/cpu/intel: " tip-bot2 for Peter Zijlstra
2019-08-22 10:23 ` [PATCH 4/5] x86/intel: Aggregate microserver naming Peter Zijlstra
2019-08-26  9:27   ` Ingo Molnar
2019-08-26  9:45     ` Peter Zijlstra
2019-08-26  9:55       ` Ingo Molnar
2019-08-26  9:46     ` Ingo Molnar
2019-08-26  9:48     ` Ingo Molnar
2019-08-26 11:46   ` [tip: x86/cpu] x86/cpu/intel: " tip-bot2 for Peter Zijlstra
2019-08-22 10:23 ` [PATCH 5/5] x86/intel: Add common OPTDIFFs Peter Zijlstra
2019-08-26 11:46   ` tip-bot2 for Peter Zijlstra [this message]
2019-08-22 20:53 ` [PATCH 0/5] Further sanitize INTEL_FAM6 naming Luck, Tony
2019-08-22 21:50   ` Luck, Tony
2019-08-23  8:12   ` Peter Zijlstra

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=156681997452.3429.12466739291110092548.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@alien8.de \
    --cc=dave.hansen@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).