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

Commit 7179385a authored by Aristeu Rozanski's avatar Aristeu Rozanski Committed by Mauro Carvalho Chehab
Browse files

sb_edac: look harder for DDRIO on Haswell systems 



In case the memory banks are populated so the first channel isn't used, the
DDRIO PCI device won't be visible and it won't be possible to determine the
memory type.

Acked-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarAristeu Rozanski <aris@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 64291f7d

drivers/edac/sb_edac.c

+11 −1
Original line number Diff line number Diff line
@@ -471,6 +471,9 @@ static const struct pci_id_table pci_dev_descr_ibridge_table[] = { 
#define PCI_DEVICE_ID_INTEL_HASWELL_IMC_HA1_TAD2 0x2f6c

#define PCI_DEVICE_ID_INTEL_HASWELL_IMC_HA1_TAD3 0x2f6d

#define PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO0 0x2fbd

#define PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO1 0x2fbf

#define PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO2 0x2fb9

#define PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO3 0x2fbb

static const struct pci_id_descr pci_dev_descr_haswell[] = {

	/* first item must be the HA */

	{ PCI_DESCR(PCI_DEVICE_ID_INTEL_HASWELL_IMC_HA0, 0)		},
@@ -488,6 +491,9 @@ static const struct pci_id_descr pci_dev_descr_haswell[] = { 
	{ PCI_DESCR(PCI_DEVICE_ID_INTEL_HASWELL_IMC_HA0_TAD3, 1)	},



	{ PCI_DESCR(PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO0, 1)		},

	{ PCI_DESCR(PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO1, 1)		},

	{ PCI_DESCR(PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO2, 1)		},

	{ PCI_DESCR(PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO3, 1)		},



	{ PCI_DESCR(PCI_DEVICE_ID_INTEL_HASWELL_IMC_HA1_TA, 1)		},

	{ PCI_DESCR(PCI_DEVICE_ID_INTEL_HASWELL_IMC_HA1_THERMAL, 1)	},
@@ -1869,6 +1875,10 @@ static int haswell_mci_bind_devs(struct mem_ctl_info *mci, 
		}

			break;

		case PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO0:

		case PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO1:

		case PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO2:

		case PCI_DEVICE_ID_INTEL_HASWELL_IMC_DDRIO3:

			if (!pvt->pci_ddrio)

				pvt->pci_ddrio = pdev;

			break;

		case PCI_DEVICE_ID_INTEL_HASWELL_IMC_HA1: