Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 947fbd4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-for_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC updates from Tony Luck:
 "All the bits that Boris had queued in his tree plus four patches to
  add support for Intel Icelake Xeon and then fix a few corner cases"

* tag 'please-pull-for_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC: Fix global-out-of-bounds write when setting edac_mc_poll_msec
  EDAC, skx, i10nm: Fix source ID register offset
  EDAC, i10nm: Check ECC enabling status per channel
  EDAC, i10nm: Add Intel additional Ice-Lake support
  EDAC: Make edac_debugfs_create_x*() return void
  EDAC/aspeed: Remove set but not used variable 'np'
  EDAC/ie31200: Reformat PCI device table
  EDAC/ie31200: Add Intel Coffee Lake CPU support
  EDAC/sifive: Add EDAC platform driver for SiFive SoCs
  EDAC/sb_edac: Remove redundant update of tad_base
  arm64: dts: stratix10: Add SDMMC EDAC node
  EDAC/altera: Add Stratix10 SDMMC support
  arm64: dts: stratix10: Add OCRAM EDAC node
  EDAC/altera: Add Stratix10 OCRAM ECC support
  EDAC/sysfs: Drop device references properly
  EDAC/sysfs: Fix memory leak when creating a csrow object
parents 6b04014f d8655e76

MAINTAINERS

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

F:	drivers/edac/sb_edac.c



EDAC-SIFIVE

M:	Yash Shah <yash.shah@sifive.com>

L:	linux-edac@vger.kernel.org

S:	Supported

F:	drivers/edac/sifive_edac.c



EDAC-SKYLAKE

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

L:	linux-edac@vger.kernel.org

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -539,6 +539,14 @@ 
				interrupts = <16 4>;

			};



			ocram-ecc@ff8cc000 {

				compatible = "altr,socfpga-s10-ocram-ecc",

					     "altr,socfpga-a10-ocram-ecc";

				reg = <0xff8cc000 0x100>;

				altr,ecc-parent = <&ocram>;

				interrupts = <1 4>;

			};



			usb0-ecc@ff8c4000 {

				compatible = "altr,socfpga-s10-usb-ecc",

					     "altr,socfpga-usb-ecc";

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

+11 −0
Original line number Diff line number Diff line
@@ -56,6 +56,17 @@ 
				clock-frequency = <25000000>;

			};

		};



		eccmgr {

			sdmmca-ecc@ff8c8c00 {

				compatible = "altr,socfpga-s10-sdmmc-ecc",

					     "altr,socfpga-sdmmc-ecc";

				reg = <0xff8c8c00 0x100>;

				altr,ecc-parent = <&mmc>;

				interrupts = <14 4>,

					     <15 4>;

			};

		};

	};

};

arch/riscv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ config RISCV 
	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_MMIOWB

	select HAVE_EBPF_JIT if 64BIT

	select EDAC_SUPPORT



config MMU

	def_bool y

drivers/edac/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -460,6 +460,12 @@ config EDAC_ALTERA_SDMMC 
	  Support for error detection and correction on the

	  Altera SDMMC FIFO Memory for Altera SoCs.



config EDAC_SIFIVE

	bool "Sifive platform EDAC driver"

	depends on EDAC=y && RISCV

	help

	  Support for error detection and correction on the SiFive SoCs.



config EDAC_SYNOPSYS

	tristate "Synopsys DDR Memory Controller"

	depends on ARCH_ZYNQ || ARCH_ZYNQMP