Commit 8de547e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac 

* 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac: (25 commits)
  i7300_edac: Properly initialize per-csrow memory size
  V4L/DVB: i7300_edac: better initialize page counts
  MAINTAINERS: Add maintainer for i7300-edac driver
  i7300-edac: CodingStyle cleanup
  i7300_edac: Improve comments
  i7300_edac: Cleanup: reorganize the file contents
  i7300_edac: Properly detect channel on CE errors
  i7300_edac: enrich FBD error info for corrected errors
  i7300_edac: enrich FBD error info for fatal errors
  i7300_edac: pre-allocate a buffer used to prepare err messages
  i7300_edac: Fix MTR x4/x8 detection logic
  i7300_edac: Make the debug messages coherent with the others
  i7300_edac: Cleanup: remove get_error_info logic
  i7300_edac: Add a code to cleanup error registers
  i7300_edac: Add support for reporting FBD errors
  i7300_edac: Properly detect the type of error correction
  i7300_edac: Detect if the device is on single mode
  i7300_edac: Adds detection for enhanced scrub mode on x8
  i7300_edac: Clear the error bit after reading
  i7300_edac: Add error detection code for global errors
  ...
parents 76c39e4f e6649cc6

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2212,6 +2212,13 @@ W: bluesmoke.sourceforge.net 
S:	Maintained

F:	drivers/edac/i5400_edac.c



EDAC-I7300

M:	Mauro Carvalho Chehab <mchehab@redhat.com>

L:	linux-edac@vger.kernel.org

W:	bluesmoke.sourceforge.net

S:	Maintained

F:	drivers/edac/i7300_edac.c



EDAC-I7CORE

M:	Mauro Carvalho Chehab <mchehab@redhat.com>

L:	linux-edac@vger.kernel.org

drivers/edac/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -209,6 +209,13 @@ config EDAC_I5100 
	  Support for error detection and correction the Intel

	  San Clemente MCH.



config EDAC_I7300

	tristate "Intel Clarksboro MCH"

	depends on EDAC_MM_EDAC && X86 && PCI

	help

	  Support for error detection and correction the Intel

	  Clarksboro MCH (Intel 7300 chipset).



config EDAC_MPC85XX

	tristate "Freescale MPC83xx / MPC85xx"

	depends on EDAC_MM_EDAC && FSL_SOC && (PPC_83xx || PPC_85xx)

drivers/edac/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ obj-$(CONFIG_EDAC_CPC925) += cpc925_edac.o 
obj-$(CONFIG_EDAC_I5000)		+= i5000_edac.o

obj-$(CONFIG_EDAC_I5100)		+= i5100_edac.o

obj-$(CONFIG_EDAC_I5400)		+= i5400_edac.o

obj-$(CONFIG_EDAC_I7300)		+= i7300_edac.o

obj-$(CONFIG_EDAC_I7CORE)		+= i7core_edac.o

obj-$(CONFIG_EDAC_E7XXX)		+= e7xxx_edac.o

obj-$(CONFIG_EDAC_E752X)		+= e752x_edac.o

drivers/edac/i7300_edac.c

0 → 100644
+1247 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/pci_ids.h

+11 −8
Original line number Diff line number Diff line
@@ -2634,6 +2634,9 @@ 
#define PCI_DEVICE_ID_INTEL_MCH_PC	0x3599

#define PCI_DEVICE_ID_INTEL_MCH_PC1	0x359a

#define PCI_DEVICE_ID_INTEL_E7525_MCH	0x359e

#define PCI_DEVICE_ID_INTEL_I7300_MCH_ERR 0x360c

#define PCI_DEVICE_ID_INTEL_I7300_MCH_FB0 0x360f

#define PCI_DEVICE_ID_INTEL_I7300_MCH_FB1 0x3610

#define PCI_DEVICE_ID_INTEL_IOAT_CNB	0x360b

#define PCI_DEVICE_ID_INTEL_FBD_CNB	0x360c

#define PCI_DEVICE_ID_INTEL_IOAT_JSF0	0x3710

CRA Git | Maintained and supported by SUSTech CRA and CCSE