linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
	Dave Hansen <dave.hansen@intel.com>,
	Borislav Petkov <bp@alien8.de>,
	Thomas Gleixner <tglx@linutronix.de>,
	Tony Luck <tony.luck@intel.com>
Subject: Re: [PATCH 4/5] x86/intel: Aggregate microserver naming
Date: Mon, 26 Aug 2019 11:27:50 +0200	[thread overview]
Message-ID: <20190826092750.GA56543@gmail.com> (raw)
In-Reply-To: <20190822102411.337145504@infradead.org>


* Peter Zijlstra <peterz@infradead.org> wrote:

> Currently big microservers have _XEON_D while small microservers have
> _X, Make it uniformly: _D.
> 
> for i in `git grep -l "INTEL_FAM6_.*_\(X\|XEON_D\)"`
> do
> 	sed -i -e 's/\(INTEL_FAM6_ATOM_.*\)_X/\1_D/g' \
>                -e 's/\(INTEL_FAM6_.*\)_XEON_D/\1_D/g' ${i}
> done
> 
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> Cc: x86@kernel.org
> Cc: Dave Hansen <dave.hansen@intel.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Tony Luck <tony.luck@intel.com>
> ---
>  arch/x86/events/intel/core.c          |   20 ++++++++++----------
>  arch/x86/events/intel/cstate.c        |   12 ++++++------
>  arch/x86/events/intel/pt.c            |    2 +-
>  arch/x86/events/intel/rapl.c          |    4 ++--
>  arch/x86/events/intel/uncore.c        |    4 ++--
>  arch/x86/events/msr.c                 |    6 +++---
>  arch/x86/include/asm/intel-family.h   |   10 +++++-----
>  arch/x86/kernel/apic/apic.c           |    2 +-
>  arch/x86/kernel/cpu/intel.c           |    4 ++--
>  arch/x86/kernel/cpu/mce/intel.c       |    2 +-
>  arch/x86/kernel/tsc.c                 |    2 +-
>  drivers/cpufreq/intel_pstate.c        |    6 +++---
>  drivers/edac/i10nm_base.c             |    4 ++--
>  drivers/edac/pnd2_edac.c              |    2 +-
>  tools/power/x86/turbostat/turbostat.c |   22 +++++++++++-----------
>  15 files changed, 51 insertions(+), 51 deletions(-)

I've added the additional renames below, accounting for recent changes in 
cpu/common.c.

Thanks,

	Ingo

---
 arch/x86/kernel/cpu/common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index f125bf7ecb6f..b6a9e27755d7 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1050,7 +1050,7 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
 	VULNWL_INTEL(ATOM_BONNELL_MID,		NO_SPECULATION),
 
 	VULNWL_INTEL(ATOM_SILVERMONT,		NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
-	VULNWL_INTEL(ATOM_SILVERMONT_X,		NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
+	VULNWL_INTEL(ATOM_SILVERMONT_D,		NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
 	VULNWL_INTEL(ATOM_SILVERMONT_MID,	NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
 	VULNWL_INTEL(ATOM_AIRMONT,		NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
 	VULNWL_INTEL(XEON_PHI_KNL,		NO_SSB | NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
@@ -1061,7 +1061,7 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
 	VULNWL_INTEL(ATOM_AIRMONT_MID,		NO_L1TF | MSBDS_ONLY | NO_SWAPGS),
 
 	VULNWL_INTEL(ATOM_GOLDMONT,		NO_MDS | NO_L1TF | NO_SWAPGS),
-	VULNWL_INTEL(ATOM_GOLDMONT_X,		NO_MDS | NO_L1TF | NO_SWAPGS),
+	VULNWL_INTEL(ATOM_GOLDMONT_D,		NO_MDS | NO_L1TF | NO_SWAPGS),
 	VULNWL_INTEL(ATOM_GOLDMONT_PLUS,	NO_MDS | NO_L1TF | NO_SWAPGS),
 
 	/*

  reply	other threads:[~2019-08-26  9:27 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 [this message]
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: x86/cpu] x86/cpu/intel: " tip-bot2 for Peter Zijlstra
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=20190826092750.GA56543@gmail.com \
    --to=mingo@kernel.org \
    --cc=bp@alien8.de \
    --cc=dave.hansen@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --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;
as well as URLs for NNTP newsgroup(s).