Date: Sun, 15 Dec 2024 13:16:18 +0100 From: Borislav Petkov To: Linus Torvalds Cc: linux-edac , lkml Subject: [GIT PULL] EDAC fix for v6.13-rc3 Hi Linus, please pull an EDAC fix for v6.13-rc3. Thx. --- The following changes since commit fac04efc5c793dccbd07e2d59af9f90b7fc0dca4: Linux 6.13-rc2 (2024-12-08 14:03:39 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git tags/edac_urgent_for_v6.13_rc3 for you to fetch changes up to 747367340ca6b5070728b86ae36ad6747f66b2fb: EDAC/amd64: Simplify ECC check on unified memory controllers (2024-12-11 21:47:33 +0100) ---------------------------------------------------------------- - Make sure amd64_edac loads successfully on certain Zen4 memory configurations ---------------------------------------------------------------- Borislav Petkov (AMD) (1): EDAC/amd64: Simplify ECC check on unified memory controllers drivers/edac/amd64_edac.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette . Date: Sat, 18 Jan 2025 12:09:17 +0100 From: Borislav Petkov To: Linus Torvalds Cc: linux-edac , lkml Subject: [GIT PULL] EDAC updates for v6.14 Hi Linus, please pull the accumulated EDAC lineup for v6.14. Thx. --- The following changes since commit fac04efc5c793dccbd07e2d59af9f90b7fc0dca4: Linux 6.13-rc2 (2024-12-08 14:03:39 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac_updates_for_v6.14 for you to fetch changes up to 368736db4d1c317ad065a1c827b09cfac942e05a: Merge remote-tracking branches 'ras/edac-drivers' and 'ras/edac-misc' into edac-updates (2025-01-17 19:36:27 +0100) ---------------------------------------------------------------- - Remove the EDAC PowerPC Cell driver due to the removal of the IBM Cell blades support - Add a new EDAC driver for Loongson SoCs which reports single-bit correctable errors - Extend the SKX and i10NM EDAC drivers to support UV systems which can have more than 8 nodes - Add Intel Clearwater Forest server support to i10nm_edac - Minor fix ---------------------------------------------------------------- Borislav Petkov (AMD) (1): Merge remote-tracking branches 'ras/edac-drivers' and 'ras/edac-misc' into edac-updates Kyle Meyer (1): EDAC/{i10nm,skx,skx_common}: Support UV systems Michael Ellerman (1): EDAC/cell: Remove powerpc Cell driver Qiuxu Zhuo (1): EDAC/i10nm: Add Intel Clearwater Forest server support Yan Zhen (1): EDAC: Fix typos in comments Zhao Qunqin (1): EDAC: Add an EDAC driver for the Loongson memory controller MAINTAINERS | 6 + arch/loongarch/Kconfig | 1 + arch/powerpc/configs/cell_defconfig | 1 - drivers/edac/Kconfig | 16 +- drivers/edac/Makefile | 3 +- drivers/edac/cell_edac.c | 281 ------------------------------------ drivers/edac/edac_mc.c | 2 +- drivers/edac/edac_mc_sysfs.c | 6 +- drivers/edac/i10nm_base.c | 12 +- drivers/edac/i5000_edac.c | 8 +- drivers/edac/loongson_edac.c | 157 ++++++++++++++++++++ drivers/edac/skx_base.c | 9 +- drivers/edac/skx_common.c | 47 ++++-- drivers/edac/skx_common.h | 3 +- 14 files changed, 222 insertions(+), 330 deletions(-) delete mode 100644 drivers/edac/cell_edac.c create mode 100644 drivers/edac/loongson_edac.c -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette . Date: Tue, 21 Jan 2025 13:09:57 +0100 From: Borislav Petkov To: Linus Torvalds Cc: x86-ml , lkml , linux-edac Subject: [GIT PULL] x86/cpu for v6.14-rc1 Hi Linus, please pull the x86/cpu lineup for v6.14-rc1. If you've pulled in the order we're sending you the pull requests and you have pulled the EDAC tree from me first, you will encounter a merge conflict in drivers/edac/i10nm_base.c due to the addition of INTEL_ATOM_DARKMONT_X there. I've included the resolution at the end of this mail. Thx. --- The following changes since commit b8f52214c61a5b99a54168145378e91b40d10c90: Merge tag 'audit-pr-20241205' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit (2024-12-05 15:11:39 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip tags/x86_cpu_for_v6.14_rc1 for you to fetch changes up to e5d3a57891ba500503df075b99b78d6e61f2694e: x86/cpu: Make all all CPUID leaf names consistent (2024-12-18 06:17:46 -0800) ---------------------------------------------------------------- - Remove the less generic CPU matching infra around struct x86_cpu_desc and use the generic struct x86_cpu_id thing - Remove magic naked numbers for CPUID functions and use proper defines of the prefix CPUID_LEAF_*. Consolidate some of the crazy use around the tree - Smaller cleanups and improvements ---------------------------------------------------------------- Borislav Petkov (AMD) (1): x86/cpufeature: Document cpu_feature_enabled() as the default to use Dave Hansen (15): x86/cpu: Introduce new microcode matching helper x86/cpu: Expose only stepping min/max interface x86/cpu: Replace PEBS use of 'x86_cpu_desc' use with 'x86_cpu_id' x86/cpu: Move AMD erratum 1386 table over to 'x86_cpu_id' x86/cpu: Remove 'x86_cpu_desc' infrastructure x86/cpu: Move MWAIT leaf definition to common header x86/cpu: Use MWAIT leaf definition x86/cpu: Remove unnecessary MwAIT leaf checks x86/cpu: Refresh DCA leaf reading code x86/cpu: Move TSC CPUID leaf definition x86/tsc: Move away from TSC leaf magic numbers x86/tsc: Remove CPUID "frequency" leaf magic numbers. x86/fpu: Move CPUID leaf definitions to common code x86/fpu: Remove unnecessary CPUID level check x86/cpu: Make all all CPUID leaf names consistent Juergen Gross (1): x86/paravirt: Remove the WBINVD callback Sohil Mehta (1): x86/cpufeatures: Free up unused feature bits arch/x86/events/intel/core.c | 62 ++++++++++------------ arch/x86/events/intel/pt.c | 5 +- arch/x86/events/intel/pt.h | 3 -- arch/x86/include/asm/cpu_device_id.h | 51 ++++--------------- arch/x86/include/asm/cpufeature.h | 18 +++---- arch/x86/include/asm/cpufeatures.h | 4 +- arch/x86/include/asm/cpuid.h | 7 +++ arch/x86/include/asm/fpu/xstate.h | 4 -- arch/x86/include/asm/mwait.h | 1 - arch/x86/include/asm/paravirt.h | 7 --- arch/x86/include/asm/paravirt_types.h | 2 - arch/x86/include/asm/special_insns.h | 8 +-- arch/x86/kernel/acpi/cstate.c | 5 +- arch/x86/kernel/apic/apic.c | 18 +++---- arch/x86/kernel/cpu/amd.c | 9 ++-- arch/x86/kernel/cpu/common.c | 85 ++++++++++++++++--------------- arch/x86/kernel/cpu/intel.c | 5 -- arch/x86/kernel/cpu/match.c | 28 ++-------- arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- arch/x86/kernel/fpu/xstate.c | 26 ++++------ arch/x86/kernel/hpet.c | 6 +-- arch/x86/kernel/paravirt.c | 6 --- arch/x86/kernel/process.c | 7 +-- arch/x86/kernel/smpboot.c | 5 +- arch/x86/kernel/tsc.c | 23 ++++----- arch/x86/xen/enlighten_pv.c | 7 ++- drivers/acpi/acpi_pad.c | 5 +- drivers/dma/ioat/dca.c | 8 +-- drivers/edac/i10nm_base.c | 21 ++++---- drivers/edac/skx_base.c | 2 +- drivers/idle/intel_idle.c | 6 +-- drivers/platform/x86/intel/pmc/core.c | 7 +-- include/linux/mod_devicetable.h | 2 + 33 files changed, 178 insertions(+), 277 deletions(-) merge resolution: index 70dff342c1b9,09bf5a3f06bf..f45d849d3f15 --- a/drivers/edac/i10nm_base.c +++ b/drivers/edac/i10nm_base.c @@@ -938,17 -938,17 +938,18 @@@ static struct res_config gnr_cfg = }; static const struct x86_cpu_id i10nm_cpuids[] = { - X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_TREMONT_D, X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0), - X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_TREMONT_D, X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1), - X86_MATCH_VFM_STEPPINGS(INTEL_ICELAKE_X, X86_STEPPINGS(0x0, 0x3), &i10nm_cfg0), - X86_MATCH_VFM_STEPPINGS(INTEL_ICELAKE_X, X86_STEPPINGS(0x4, 0xf), &i10nm_cfg1), - X86_MATCH_VFM_STEPPINGS(INTEL_ICELAKE_D, X86_STEPPINGS(0x0, 0xf), &i10nm_cfg1), - X86_MATCH_VFM_STEPPINGS(INTEL_SAPPHIRERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg), - X86_MATCH_VFM_STEPPINGS(INTEL_EMERALDRAPIDS_X, X86_STEPPINGS(0x0, 0xf), &spr_cfg), - X86_MATCH_VFM_STEPPINGS(INTEL_GRANITERAPIDS_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), - X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_CRESTMONT_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), - X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_CRESTMONT, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), - X86_MATCH_VFM_STEPPINGS(INTEL_ATOM_DARKMONT_X, X86_STEPPINGS(0x0, 0xf), &gnr_cfg), + X86_MATCH_VFM_STEPS(INTEL_ATOM_TREMONT_D, X86_STEP_MIN, 0x3, &i10nm_cfg0), + X86_MATCH_VFM_STEPS(INTEL_ATOM_TREMONT_D, 0x4, X86_STEP_MAX, &i10nm_cfg1), + X86_MATCH_VFM_STEPS(INTEL_ICELAKE_X, X86_STEP_MIN, 0x3, &i10nm_cfg0), + X86_MATCH_VFM_STEPS(INTEL_ICELAKE_X, 0x4, X86_STEP_MAX, &i10nm_cfg1), + X86_MATCH_VFM( INTEL_ICELAKE_D, &i10nm_cfg1), + + X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, &spr_cfg), + X86_MATCH_VFM(INTEL_EMERALDRAPIDS_X, &spr_cfg), + X86_MATCH_VFM(INTEL_GRANITERAPIDS_X, &gnr_cfg), + X86_MATCH_VFM(INTEL_ATOM_CRESTMONT_X, &gnr_cfg), + X86_MATCH_VFM(INTEL_ATOM_CRESTMONT, &gnr_cfg), ++ X86_MATCH_VFM(INTEL_ATOM_DARKMONT_X, &gnr_cfg), {} }; MODULE_DEVICE_TABLE(x86cpu, i10nm_cpuids); -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette .