Commit 0763dd89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_updates_for_v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC updates from Borislav Petkov:

 - 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

* tag 'edac_updates_for_v6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/cell: Remove powerpc Cell driver
  EDAC: Add an EDAC driver for the Loongson memory controller
  EDAC: Fix typos in comments
  EDAC/{i10nm,skx,skx_common}: Support UV systems
  EDAC/i10nm: Add Intel Clearwater Forest server support
parents d3504411 368736db

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -13550,6 +13550,12 @@ S: Maintained 
F:	Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml

F:	drivers/thermal/loongson2_thermal.c









LOONGSON EDAC DRIVER









M:	Zhao Qunqin <zhaoqunqin@loongson.cn>









L:	linux-edac@vger.kernel.org









S:	Maintained









F:	drivers/edac/loongson_edac.c

















LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)









M:	Sathya Prakash <sathya.prakash@broadcom.com>









M:	Sreekanth Reddy <sreekanth.reddy@broadcom.com>
































arch/loongarch/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -81,6 +81,7 @@ config LOONGARCH







	select BUILDTIME_TABLE_SORT









	select COMMON_CLK









	select CPU_PM









	select EDAC_SUPPORT









	select EFI









	select GENERIC_CLOCKEVENTS









	select GENERIC_CMOS_UPDATE
































arch/powerpc/configs/cell_defconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -168,7 +168,6 @@ CONFIG_INFINIBAND_MTHCA=m







CONFIG_INFINIBAND_IPOIB=m









CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y









CONFIG_EDAC=y









CONFIG_EDAC_CELL=y









CONFIG_UIO=m









CONFIG_EXT2_FS=y









CONFIG_EXT4_FS=y
































drivers/edac/Kconfig



+8
−8






























Original line number
Diff line number
Diff line







@@ -303,14 +303,6 @@ config EDAC_PASEMI







	  Support for error detection and correction on PA Semi









	  PWRficient.



















config EDAC_CELL









	tristate "Cell Broadband Engine memory controller"









	depends on PPC_CELL_COMMON









	help









	  Support for error detection and correction on the









	  Cell Broadband Engine internal memory controller









	  on platform without a hypervisor



















config EDAC_CPC925









	tristate "IBM CPC925 Memory Controller (PPC970FX)"









	depends on PPC64








@@ -546,5 +538,13 @@ config EDAC_VERSAL







	  Support injecting both correctable and uncorrectable errors









	  for debugging purposes.



















config EDAC_LOONGSON









	tristate "Loongson Memory Controller"









	depends on LOONGARCH && ACPI









	help









	  Support for error detection and correction on the Loongson









	  family memory controller. This driver reports single bit









	  errors (CE) only. Loongson-3A5000/3C5000/3D5000/3A6000/3C6000









	  are compatible.



















endif # EDAC
























drivers/edac/Makefile



+1
−2






























Original line number
Diff line number
Diff line







@@ -62,8 +62,6 @@ obj-$(CONFIG_EDAC_SKX)			+= skx_edac.o skx_edac_common.o







i10nm_edac-y				:= i10nm_base.o









obj-$(CONFIG_EDAC_I10NM)		+= i10nm_edac.o skx_edac_common.o



















obj-$(CONFIG_EDAC_CELL)			+= cell_edac.o



















obj-$(CONFIG_EDAC_HIGHBANK_MC)		+= highbank_mc_edac.o









obj-$(CONFIG_EDAC_HIGHBANK_L2)		+= highbank_l2_edac.o


















@@ -86,3 +84,4 @@ obj-$(CONFIG_EDAC_DMC520)		+= dmc520_edac.o







obj-$(CONFIG_EDAC_NPCM)			+= npcm_edac.o









obj-$(CONFIG_EDAC_ZYNQMP)		+= zynqmp_edac.o









obj-$(CONFIG_EDAC_VERSAL)		+= versal_edac.o









obj-$(CONFIG_EDAC_LOONGSON)		+= loongson_edac.o