Skip to content

Commit 0763dd8

Browse files
committed
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
2 parents d350441 + 368736d commit 0763dd8

File tree

14 files changed

+222
-330
lines changed

14 files changed

+222
-330
lines changed

MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13550,6 +13550,12 @@ S: Maintained
1355013550
F: Documentation/devicetree/bindings/thermal/loongson,ls2k-thermal.yaml
1355113551
F: drivers/thermal/loongson2_thermal.c
1355213552

13553+
LOONGSON EDAC DRIVER
13554+
M: Zhao Qunqin <[email protected]>
13555+
13556+
S: Maintained
13557+
F: drivers/edac/loongson_edac.c
13558+
1355313559
LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
1355413560
M: Sathya Prakash <[email protected]>
1355513561
M: Sreekanth Reddy <[email protected]>

arch/loongarch/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ config LOONGARCH
8181
select BUILDTIME_TABLE_SORT
8282
select COMMON_CLK
8383
select CPU_PM
84+
select EDAC_SUPPORT
8485
select EFI
8586
select GENERIC_CLOCKEVENTS
8687
select GENERIC_CMOS_UPDATE

arch/powerpc/configs/cell_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ CONFIG_INFINIBAND_MTHCA=m
168168
CONFIG_INFINIBAND_IPOIB=m
169169
CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
170170
CONFIG_EDAC=y
171-
CONFIG_EDAC_CELL=y
172171
CONFIG_UIO=m
173172
CONFIG_EXT2_FS=y
174173
CONFIG_EXT4_FS=y

drivers/edac/Kconfig

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -303,14 +303,6 @@ config EDAC_PASEMI
303303
Support for error detection and correction on PA Semi
304304
PWRficient.
305305

306-
config EDAC_CELL
307-
tristate "Cell Broadband Engine memory controller"
308-
depends on PPC_CELL_COMMON
309-
help
310-
Support for error detection and correction on the
311-
Cell Broadband Engine internal memory controller
312-
on platform without a hypervisor
313-
314306
config EDAC_CPC925
315307
tristate "IBM CPC925 Memory Controller (PPC970FX)"
316308
depends on PPC64
@@ -546,5 +538,13 @@ config EDAC_VERSAL
546538
Support injecting both correctable and uncorrectable errors
547539
for debugging purposes.
548540

541+
config EDAC_LOONGSON
542+
tristate "Loongson Memory Controller"
543+
depends on LOONGARCH && ACPI
544+
help
545+
Support for error detection and correction on the Loongson
546+
family memory controller. This driver reports single bit
547+
errors (CE) only. Loongson-3A5000/3C5000/3D5000/3A6000/3C6000
548+
are compatible.
549549

550550
endif # EDAC

drivers/edac/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ obj-$(CONFIG_EDAC_SKX) += skx_edac.o skx_edac_common.o
6262
i10nm_edac-y := i10nm_base.o
6363
obj-$(CONFIG_EDAC_I10NM) += i10nm_edac.o skx_edac_common.o
6464

65-
obj-$(CONFIG_EDAC_CELL) += cell_edac.o
66-
6765
obj-$(CONFIG_EDAC_HIGHBANK_MC) += highbank_mc_edac.o
6866
obj-$(CONFIG_EDAC_HIGHBANK_L2) += highbank_l2_edac.o
6967

@@ -86,3 +84,4 @@ obj-$(CONFIG_EDAC_DMC520) += dmc520_edac.o
8684
obj-$(CONFIG_EDAC_NPCM) += npcm_edac.o
8785
obj-$(CONFIG_EDAC_ZYNQMP) += zynqmp_edac.o
8886
obj-$(CONFIG_EDAC_VERSAL) += versal_edac.o
87+
obj-$(CONFIG_EDAC_LOONGSON) += loongson_edac.o

drivers/edac/cell_edac.c

Lines changed: 0 additions & 281 deletions
This file was deleted.

drivers/edac/edac_mc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static int edac_mc_alloc_csrows(struct mem_ctl_info *mci)
214214
unsigned int row, chn;
215215

216216
/*
217-
* Alocate and fill the csrow/channels structs
217+
* Allocate and fill the csrow/channels structs
218218
*/
219219
mci->csrows = kcalloc(tot_csrows, sizeof(*mci->csrows), GFP_KERNEL);
220220
if (!mci->csrows)

drivers/edac/edac_mc_sysfs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ static inline int nr_pages_per_csrow(struct csrow_info *csrow)
422422
return nr_pages;
423423
}
424424

425-
/* Create a CSROW object under specifed edac_mc_device */
425+
/* Create a CSROW object under specified edac_mc_device */
426426
static int edac_create_csrow_object(struct mem_ctl_info *mci,
427427
struct csrow_info *csrow, int index)
428428
{
@@ -449,7 +449,7 @@ static int edac_create_csrow_object(struct mem_ctl_info *mci,
449449
return 0;
450450
}
451451

452-
/* Create a CSROW object under specifed edac_mc_device */
452+
/* Create a CSROW object under specified edac_mc_device */
453453
static int edac_create_csrow_objects(struct mem_ctl_info *mci)
454454
{
455455
int err, i;
@@ -636,7 +636,7 @@ static void dimm_release(struct device *dev)
636636
*/
637637
}
638638

639-
/* Create a DIMM object under specifed memory controller device */
639+
/* Create a DIMM object under specified memory controller device */
640640
static int edac_create_dimm_object(struct mem_ctl_info *mci,
641641
struct dimm_info *dimm)
642642
{

0 commit comments

Comments
 (0)