From: Peter Zijlstra <peterz@infradead.org>
To: x86@kernel.org
Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
jolsa@kernel.org, namhyung@kernel.org, irogers@google.com,
adrian.hunter@intel.com, tglx@linutronix.de, bp@alien8.de,
dave.hansen@linux.intel.com, hpa@zytor.com,
Tony Luck <tony.luck@intel.com>,
luto@kernel.org, james.morse@arm.com, mchehab@kernel.org,
rric@kernel.org, jacob.jun.pan@linux.intel.com, lenb@kernel.org,
irenic.rajneesh@gmail.com, david.e.box@intel.com,
hdegoede@redhat.com, markgross@kernel.org,
srinivas.pandruvada@linux.intel.com, rafael@kernel.org,
daniel.lezcano@linaro.org, amitk@kernel.org, rui.zhang@intel.com,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-edac@vger.kernel.org, linux-pm@vger.kernel.org,
platform-driver-x86@vger.kernel.org
Subject: [PATCH 2/3] x86/cpu: Fix Crestmont uarch
Date: Mon, 07 Aug 2023 14:38:08 +0200 [thread overview]
Message-ID: <20230807150405.757666627@infradead.org> (raw)
In-Reply-To: 20230807123806.700370534@infradead.org
Sierra Forest and Grand Ridge are both E-core only using Crestmont
micro-architecture, They fit the pre-existing naming scheme prefectly
fine, adhere to it.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/include/asm/intel-family.h | 5 ++---
drivers/edac/i10nm_base.c | 2 +-
drivers/platform/x86/intel/speed_select_if/isst_if_common.c | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -155,9 +155,8 @@
#define INTEL_FAM6_ATOM_GRACEMONT 0xBE /* Alderlake N */
-#define INTEL_FAM6_SIERRAFOREST_X 0xAF
-
-#define INTEL_FAM6_GRANDRIDGE 0xB6
+#define INTEL_FAM6_ATOM_CRESTMONT_X 0xAF /* Sierra Forest */
+#define INTEL_FAM6_ATOM_CRESTMONT 0xB6 /* Grand Ridge */
/* Xeon Phi */
--- a/drivers/edac/i10nm_base.c
+++ b/drivers/edac/i10nm_base.c
@@ -906,7 +906,7 @@ static const struct x86_cpu_id i10nm_cpu
X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SAPPHIRERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg),
X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(EMERALDRAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg),
X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(GRANITERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg),
- X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SIERRAFOREST_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg),
+ X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_CRESTMONT_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg),
{}
};
MODULE_DEVICE_TABLE(x86cpu, i10nm_cpuids);
--- a/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_common.c
@@ -720,7 +720,7 @@ static struct miscdevice isst_if_char_dr
static const struct x86_cpu_id hpm_cpu_ids[] = {
X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X, NULL),
- X86_MATCH_INTEL_FAM6_MODEL(SIERRAFOREST_X, NULL),
+ X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X, NULL),
{}
};
next prev parent reply other threads:[~2023-08-07 15:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-07 12:38 [PATCH 0/3] x86/cpu: Cleanup of INTEL_FAM6_foo Peter Zijlstra
2023-08-07 12:38 ` [PATCH 1/3] x86/cpu: Fix Gracemont uarch Peter Zijlstra
2023-08-07 12:38 ` Peter Zijlstra [this message]
2023-08-07 12:38 ` [PATCH 3/3] x86/cpu: Update Hybrids Peter Zijlstra
2023-08-07 17:36 ` [PATCH 0/3] x86/cpu: Cleanup of INTEL_FAM6_foo Rafael J. Wysocki
2023-08-07 17:56 ` Hans de Goede
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=20230807150405.757666627@infradead.org \
--to=peterz@infradead.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=amitk@kernel.org \
--cc=bp@alien8.de \
--cc=daniel.lezcano@linaro.org \
--cc=dave.hansen@linux.intel.com \
--cc=david.e.box@intel.com \
--cc=hdegoede@redhat.com \
--cc=hpa@zytor.com \
--cc=irenic.rajneesh@gmail.com \
--cc=irogers@google.com \
--cc=jacob.jun.pan@linux.intel.com \
--cc=james.morse@arm.com \
--cc=jolsa@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=markgross@kernel.org \
--cc=mchehab@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rric@kernel.org \
--cc=rui.zhang@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
--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).