Commit 14c357c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_updates_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC updates from Borislav Petkov:

 - Remove two drivers for obsolete hardware: i82443bxgx_edac and
   r82600_edac

 - Add support for Intel Amston Lake and Panther Lake-H SoCs to
   igen6_edac

 - The usual amount of fixes and cleanups

* tag 'edac_updates_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/r82600: Remove this obsolete driver
  EDAC/i82443bxgx: Remove driver that has been marked broken since 2007
  EDAC/amd64: Avoid a -Wformat-security warning
  RAS/AMD/ATL: Remove an unneeded semicolon
  EDAC/igen6: Add more Intel Panther Lake-H SoCs support
  EDAC/igen6: Make masks of {MCHBAR, TOM, TOUUD, ECC_ERROR_LOG} configurable
  EDAC/igen6: Add two Intel Amston Lake SoCs support
  EDAC/i5400: Fix snprintf() limit calculation in calculate_dimm_size()
  EDAC/i5000: Fix snprintf() size calculation in calculate_dimm_size()
parents 2619c62b 5b115dcc

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -3771,6 +3771,11 @@ S: 10 Stockalls Place 
S: Minto, NSW, 2566

S: Australia



N: Tim Small

E: tim@buttersideup.com

D: Intel 82443BX/GX (440BX/GX chipset) EDAC driver

D: Radisys 82600 embedded chipset EDAC driver



N: Stephen Smalley

E: sds@tycho.nsa.gov

D: portions of the Linux Security Module (LSM) framework and security modules

MAINTAINERS

+0 −12
Original line number Diff line number Diff line
@@ -9125,12 +9125,6 @@ L: linux-edac@vger.kernel.org 
S:	Maintained

F:	drivers/edac/i7core_edac.c









EDAC-I82443BXGX









M:	Tim Small <tim@buttersideup.com>









L:	linux-edac@vger.kernel.org









S:	Maintained









F:	drivers/edac/i82443bxgx_edac.c

















EDAC-I82975X









M:	"Arvind R." <arvino55@gmail.com>









L:	linux-edac@vger.kernel.org








@@ -9183,12 +9177,6 @@ L:	linux-edac@vger.kernel.org







S:	Maintained









F:	drivers/edac/qcom_edac.c

















EDAC-R82600









M:	Tim Small <tim@buttersideup.com>









L:	linux-edac@vger.kernel.org









S:	Maintained









F:	drivers/edac/r82600_edac.c

















EDAC-SBRIDGE









M:	Tony Luck <tony.luck@intel.com>









R:	Qiuxu Zhuo <qiuxu.zhuo@intel.com>
































drivers/edac/Kconfig



+0
−15






























Original line number
Diff line number
Diff line







@@ -150,14 +150,6 @@ config EDAC_E752X







	  Support for error detection and correction on the Intel









	  E7520, E7525, E7320 server chipsets.



















config EDAC_I82443BXGX









	tristate "Intel 82443BX/GX (440BX/GX)"









	depends on PCI && X86_32









	depends on BROKEN









	help









	  Support for error detection and correction on the Intel









	  82443BX/GX memory controllers (440BX/GX chipsets).



















config EDAC_I82875P









	tristate "Intel 82875p (D82875P, E7210)"









	depends on PCI && X86_32








@@ -223,13 +215,6 @@ config EDAC_I82860







	  Support for error detection and correction on the Intel









	  82860 chipset.



















config EDAC_R82600









	tristate "Radisys 82600 embedded chipset"









	depends on PCI && X86_32









	help









	  Support for error detection and correction on the Radisys









	  82600 embedded chipset.



















config EDAC_I5000









	tristate "Intel Greencreek/Blackford chipset"









	depends on X86 && PCI
































drivers/edac/Makefile



+0
−2






























Original line number
Diff line number
Diff line







@@ -38,7 +38,6 @@ obj-$(CONFIG_EDAC_PND2)			+= pnd2_edac.o







obj-$(CONFIG_EDAC_IGEN6)			+= igen6_edac.o









obj-$(CONFIG_EDAC_E7XXX)		+= e7xxx_edac.o









obj-$(CONFIG_EDAC_E752X)		+= e752x_edac.o









obj-$(CONFIG_EDAC_I82443BXGX)		+= i82443bxgx_edac.o









obj-$(CONFIG_EDAC_I82875P)		+= i82875p_edac.o









obj-$(CONFIG_EDAC_I82975X)		+= i82975x_edac.o









obj-$(CONFIG_EDAC_I3000)		+= i3000_edac.o








@@ -46,7 +45,6 @@ obj-$(CONFIG_EDAC_I3200)		+= i3200_edac.o







obj-$(CONFIG_EDAC_IE31200)		+= ie31200_edac.o









obj-$(CONFIG_EDAC_X38)			+= x38_edac.o









obj-$(CONFIG_EDAC_I82860)		+= i82860_edac.o









obj-$(CONFIG_EDAC_R82600)		+= r82600_edac.o









obj-$(CONFIG_EDAC_AMD64)		+= amd64_edac.o



















obj-$(CONFIG_EDAC_PASEMI)		+= pasemi_edac.o
































drivers/edac/amd64_edac.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -3911,7 +3911,7 @@ static int per_family_init(struct amd64_pvt *pvt)







	}



















	if (tmp_name)









		scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), tmp_name);









		scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "%s", tmp_name);









	else









		scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "F%02Xh_M%02Xh",









			  pvt->fam, pvt->model);