Commit 08f0cd22 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Yunying Sun
Browse files

x86/cpu: Fix Crestmont uarch

mainline inclusion
from mainline-v6.6-rc1
commit 0cfd8fba
category: feature
feature: SRF core PMU support
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I8RWG5
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0cfd8fbadd6833d243c9a9d8649ba4a9f4361c93



Intel-SIG: commit 0cfd8fba x86/cpu: Fix Crestmont uarch
Backport as a dependency for Sierra Forrest core PMU support.

-------------------------------------

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: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230807150405.757666627@infradead.org


Signed-off-by: default avatarYunying Sun <yunying.sun@intel.com>
parent e0396943
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -147,9 +147,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 */