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

Commit 19fe4165 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull EDAC updates from Borislav Petkov:
 "A lot of movement in the EDAC tree this time around, coarse summary
  below:

   - Altera Arria10 enablement of NAND, DMA, USB, QSPI and SD-MMC FIFO
     buffers (Thor Thayer)

   - split the memory controller part out of mpc85xx and share it with a
     new Freescale ARM Layerscape driver (York Sun)

   - amd64_edac fixes (Yazen Ghannam)

   - misc cleanups, refactoring and fixes all over the place"

* tag 'edac_for_4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (37 commits)
  EDAC, altera: Add IRQ Flags to disable IRQ while handling
  EDAC, altera: Correct EDAC IRQ error message
  EDAC, amd64: Autoload module using x86_cpu_id
  EDAC, sb_edac: Remove NULL pointer check on array pci_tad
  EDAC: Remove NO_IRQ from powerpc-only drivers
  EDAC, fsl_ddr: Fix error return code in fsl_mc_err_probe()
  EDAC, fsl_ddr: Add entry to MAINTAINERS
  EDAC: Move Doug Thompson to CREDITS
  EDAC, I3000: Orphan driver
  EDAC, fsl_ddr: Replace simple_strtoul() with kstrtoul()
  EDAC, layerscape: Add Layerscape EDAC support
  EDAC, fsl_ddr: Fix IRQ dispose warning when module is removed
  EDAC, fsl_ddr: Add support for little endian
  EDAC, fsl_ddr: Add missing DDR DRAM types
  EDAC, fsl_ddr: Rename macros and names
  EDAC, fsl-ddr: Separate FSL DDR driver from MPC85xx
  EDAC, mpc85xx: Replace printk() with pr_* format
  EDAC, mpc85xx: Drop setting/clearing RFXE bit in HID1
  EDAC, altera: Rename MC trigger to common name
  EDAC, altera: Rename device trigger to common name
  ...
parents 58e4411b a29d64a4

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -3523,6 +3523,10 @@ S: 145 Howard St. 
S: Northborough, MA 01532

S: USA



N: Doug Thompson

E: dougthompson@xmission.com

D: EDAC



N: Tommy Thorn

E: Tommy.Thorn@irisa.fr

W: http://www.irisa.fr/prive/thorn/index.html
@@ -3659,6 +3663,10 @@ S: Obere Heerbergstrasse 17 
S: 97078 Wuerzburg

S: Germany



N: Jason Uhlenkott

E: juhlenko@akamai.com

D: I3000 EDAC driver



N: Greg Ungerer

E: gerg@snapgear.com

D: uClinux kernel hacker

Documentation/devicetree/bindings/arm/altera/socfpga-eccmgr.txt

+98 −0
Original line number Diff line number Diff line
@@ -90,6 +90,47 @@ Required Properties: 
- interrupts      : Should be single bit error interrupt, then double bit error

	interrupt, in this order.



NAND FIFO ECC

Required Properties:

- compatible      : Should be "altr,socfpga-nand-ecc"

- reg             : Address and size for ECC block registers.

- altr,ecc-parent : phandle to parent NAND node.

- interrupts      : Should be single bit error interrupt, then double bit error

	interrupt, in this order.



DMA FIFO ECC

Required Properties:

- compatible      : Should be "altr,socfpga-dma-ecc"

- reg             : Address and size for ECC block registers.

- altr,ecc-parent : phandle to parent DMA node.

- interrupts      : Should be single bit error interrupt, then double bit error

	interrupt, in this order.



USB FIFO ECC

Required Properties:

- compatible      : Should be "altr,socfpga-usb-ecc"

- reg             : Address and size for ECC block registers.

- altr,ecc-parent : phandle to parent USB node.

- interrupts      : Should be single bit error interrupt, then double bit error

	interrupt, in this order.



QSPI FIFO ECC

Required Properties:

- compatible      : Should be "altr,socfpga-qspi-ecc"

- reg             : Address and size for ECC block registers.

- altr,ecc-parent : phandle to parent QSPI node.

- interrupts      : Should be single bit error interrupt, then double bit error

	interrupt, in this order.



SDMMC FIFO ECC

Required Properties:

- compatible      : Should be "altr,socfpga-sdmmc-ecc"

- reg             : Address and size for ECC block registers.

- altr,ecc-parent : phandle to parent SD/MMC node.

- interrupts      : Should be single bit error interrupt, then double bit error

	interrupt, in this order for port A, and then single bit error interrupt,

	then double bit error interrupt in this order for port B.



Example:



	eccmgr: eccmgr@ffd06000 {
@@ -132,4 +173,61 @@ Example: 
			interrupts = <5 IRQ_TYPE_LEVEL_HIGH>,

				     <37 IRQ_TYPE_LEVEL_HIGH>;

		};



		nand-buf-ecc@ff8c2000 {

			compatible = "altr,socfpga-nand-ecc";

			reg = <0xff8c2000 0x400>;

			altr,ecc-parent = <&nand>;

			interrupts = <11 IRQ_TYPE_LEVEL_HIGH>,

				     <43 IRQ_TYPE_LEVEL_HIGH>;

		};



		nand-rd-ecc@ff8c2400 {

			compatible = "altr,socfpga-nand-ecc";

			reg = <0xff8c2400 0x400>;

			altr,ecc-parent = <&nand>;

			interrupts = <13 IRQ_TYPE_LEVEL_HIGH>,

				     <45 IRQ_TYPE_LEVEL_HIGH>;

		};



		nand-wr-ecc@ff8c2800 {

			compatible = "altr,socfpga-nand-ecc";

			reg = <0xff8c2800 0x400>;

			altr,ecc-parent = <&nand>;

			interrupts = <12 IRQ_TYPE_LEVEL_HIGH>,

				     <44 IRQ_TYPE_LEVEL_HIGH>;

		};



		dma-ecc@ff8c8000 {

			compatible = "altr,socfpga-dma-ecc";

			reg = <0xff8c8000 0x400>;

			altr,ecc-parent = <&pdma>;

			interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,

				     <42 IRQ_TYPE_LEVEL_HIGH>;



		usb0-ecc@ff8c8800 {

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

			reg = <0xff8c8800 0x400>;

			altr,ecc-parent = <&usb0>;

			interrupts = <2 IRQ_TYPE_LEVEL_HIGH>,

				     <34 IRQ_TYPE_LEVEL_HIGH>;

		};



		qspi-ecc@ff8c8400 {

			compatible = "altr,socfpga-qspi-ecc";

			reg = <0xff8c8400 0x400>;

			altr,ecc-parent = <&qspi>;

			interrupts = <14 IRQ_TYPE_LEVEL_HIGH>,

				     <46 IRQ_TYPE_LEVEL_HIGH>;

		};



		sdmmc-ecc@ff8c2c00 {

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

			reg = <0xff8c2c00 0x400>;

			altr,ecc-parent = <&mmc>;

			interrupts = <15 IRQ_TYPE_LEVEL_HIGH>,

				     <47 IRQ_TYPE_LEVEL_HIGH>,

				     <16 IRQ_TYPE_LEVEL_HIGH>,

				     <48 IRQ_TYPE_LEVEL_HIGH>;

		};

	};

Documentation/devicetree/bindings/powerpc/fsl/mem-ctrlr.txt→Documentation/devicetree/bindings/memory-controllers/fsl/ddr.txt

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ Properties: 
		  "fsl,qoriq-memory-controller".

- reg		: Address and size of DDR controller registers

- interrupts	: Error interrupt of DDR controller

- little-endian	: Specifies little-endian access to registers

		  If omitted, big-endian will be used.



Example 1:

MAINTAINERS

+7 −8
Original line number Diff line number Diff line
@@ -4410,7 +4410,6 @@ F: Documentation/filesystems/ecryptfs.txt 
F:	fs/ecryptfs/



EDAC-CORE

M:	Doug Thompson <dougthompson@xmission.com>

M:	Borislav Petkov <bp@alien8.de>

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -4423,14 +4422,12 @@ F: drivers/edac/ 
F:	include/linux/edac.h



EDAC-AMD64

M:	Doug Thompson <dougthompson@xmission.com>

M:	Borislav Petkov <bp@alien8.de>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	drivers/edac/amd64_edac*



EDAC-CALXEDA

M:	Doug Thompson <dougthompson@xmission.com>

M:	Robert Richter <rric@kernel.org>

L:	linux-edac@vger.kernel.org

S:	Maintained
@@ -4446,17 +4443,21 @@ F: drivers/edac/octeon_edac* 


EDAC-E752X

M:	Mark Gross <mark.gross@intel.com>

M:	Doug Thompson <dougthompson@xmission.com>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	drivers/edac/e752x_edac.c



EDAC-E7XXX

M:	Doug Thompson <dougthompson@xmission.com>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	drivers/edac/e7xxx_edac.c



EDAC-FSL_DDR

M:	York Sun <york.sun@nxp.com>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	drivers/edac/fsl_ddr_edac.*



EDAC-GHES

M:	Mauro Carvalho Chehab <mchehab@s-opensource.com>

M:	Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -4471,13 +4472,11 @@ S: Maintained 
F:	drivers/edac/i82443bxgx_edac.c



EDAC-I3000

M:	Jason Uhlenkott <juhlenko@akamai.com>

L:	linux-edac@vger.kernel.org

S:	Maintained

S:	Orphan

F:	drivers/edac/i3000_edac.c



EDAC-I5000

M:	Doug Thompson <dougthompson@xmission.com>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	drivers/edac/i5000_edac.c

arch/arm/boot/dts/socfpga_arria10.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -639,6 +639,22 @@ 
				interrupts = <5 IRQ_TYPE_LEVEL_HIGH>,

					     <37 IRQ_TYPE_LEVEL_HIGH>;

			};



			dma-ecc@ff8c8000 {

				compatible = "altr,socfpga-dma-ecc";

				reg = <0xff8c8000 0x400>;

				altr,ecc-parent = <&pdma>;

				interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,

					     <42 IRQ_TYPE_LEVEL_HIGH>;

			};



			usb0-ecc@ff8c8800 {

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

				reg = <0xff8c8800 0x400>;

				altr,ecc-parent = <&usb0>;

				interrupts = <2 IRQ_TYPE_LEVEL_HIGH>,

					     <34 IRQ_TYPE_LEVEL_HIGH>;

			};

		};



		rst: rstmgr@ffd05000 {