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

Commit 9697e9da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 

Pull EDAC updates from Borislav Petkov:

 - new EDAC driver for some TI SOCs (Tero Kristo)

 - small cleanups

* tag 'edac_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, mv64x60: Fix an error handling path
  EDAC, ti: Add support for TI keystone and DRA7xx EDAC
  EDAC, octeon: Fix an uninitialized variable warning
parents b5856f97 68fa24f9

MAINTAINERS

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

F:	drivers/edac/skx_edac.c



EDAC-TI

M:	Tero Kristo <t-kristo@ti.com>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	drivers/edac/ti_edac.c



EDIROL UA-101/UA-1000 DRIVER

M:	Clemens Ladisch <clemens@ladisch.de>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

drivers/edac/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -457,4 +457,11 @@ config EDAC_XGENE 
	  Support for error detection and correction on the

	  APM X-Gene family of SOCs.



config EDAC_TI

	tristate "Texas Instruments DDR3 ECC Controller"

	depends on ARCH_KEYSTONE || SOC_DRA7XX

	help

	  Support for error detection and correction on the

          TI SoCs.



endif # EDAC

drivers/edac/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -78,3 +78,4 @@ obj-$(CONFIG_EDAC_THUNDERX) += thunderx_edac.o 
obj-$(CONFIG_EDAC_ALTERA)		+= altera_edac.o

obj-$(CONFIG_EDAC_SYNOPSYS)		+= synopsys_edac.o

obj-$(CONFIG_EDAC_XGENE)		+= xgene_edac.o

obj-$(CONFIG_EDAC_TI)			+= ti_edac.o

drivers/edac/mv64x60_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev) 
		/* Non-ECC RAM? */

		printk(KERN_WARNING "%s: No ECC DIMMs discovered\n", __func__);

		res = -ENODEV;

		goto err2;

		goto err;

	}



	edac_dbg(3, "init mci\n");

drivers/edac/octeon_edac-lmc.c

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ static void octeon_lmc_edac_poll_o2(struct mem_ctl_info *mci) 
	if (!pvt->inject)

		int_reg.u64 = cvmx_read_csr(CVMX_LMCX_INT(mci->mc_idx));

	else {

		int_reg.u64 = 0;

		if (pvt->error_type == 1)

			int_reg.s.sec_err = 1;

		if (pvt->error_type == 2)