Skip to content

Commit 3004c59

Browse files
committed
Merge: EDAC/i10nm: Add Intel Sierra Forest server support
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/3320 JIRA: https://issues.redhat.com/browse/RHEL-24446 Tested: by me Conflicts: we have 0cfd8fb already backported which renames the Sierra Forest family macro but the EDAC part wasn't backported because this patch wasn't present yet. Use the new name. Depends: MR#3231 v2: rebased, migrated to jira commit 96ae399 Author: Qiuxu Zhuo <qiuxu.zhuo@intel.com> Date: Mon Apr 10 21:15:31 2023 +0800 EDAC/i10nm: Add Intel Sierra Forest server support The Sierra Forest CPU model uses similar memory controller registers as Granite Rapids server. Add Sierra Forest CPU model ID for EDAC support. Tested-by: Li Zhang <li4.zhang@intel.com> Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com> Link: https://lore.kernel.org/r/20230410131531.11914-1-qiuxu.zhuo@intel.com Signed-off-by: Aristeu Rozanski <arozansk@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Rafael Aquini <aquini@redhat.com> Approved-by: Prarit Bhargava <prarit@redhat.com> Signed-off-by: Scott Weaver <scweaver@redhat.com>
2 parents 4e6c0f5 + 3204452 commit 3004c59

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/edac/i10nm_base.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,7 @@ static const struct x86_cpu_id i10nm_cpuids[] = {
762762
X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(SAPPHIRERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg),
763763
X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(EMERALDRAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg),
764764
X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(GRANITERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg),
765+
X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(ATOM_CRESTMONT_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg),
765766
{}
766767
};
767768
MODULE_DEVICE_TABLE(x86cpu, i10nm_cpuids);

0 commit comments

Comments
 (0)