Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit e7afafa82e799a946cc1b88de2af9c23dc267687

Authored by Borislav Petkov
Committed by Greg Kroah-Hartman
1 parent 63a7d0a916

sb_edac: Fix detection on SNB machines 

commit 11249e73992981e31fd50e7231da24fad68e3320 upstream.

d0585cd815fa ("sb_edac: Claim a different PCI device") changed the
probing of sb_edac to look for PCI device 0x3ca0:

3f:0e.0 System peripheral: Intel Corporation Xeon E5/Core i7 Processor Home Agent (rev 07)
00: 86 80 a0 3c 00 00 00 00 07 00 80 08 00 00 80 00
...

but we're matching for 0x3ca8, i.e. PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA
in sbridge_probe() therefore the probing fails.

Changing it to probe for 0x3ca0 (PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0),
.i.e., the 14.0 device, fixes the issue and driver loads successfully
again:

[ 2449.013120] EDAC DEBUG: sbridge_init:
[ 2449.017029] EDAC sbridge: Seeking for: PCI ID 8086:3ca0
[ 2449.022368] EDAC DEBUG: sbridge_get_onedevice: Detected 8086:3ca0
[ 2449.028498] EDAC sbridge: Seeking for: PCI ID 8086:3ca0
[ 2449.033768] EDAC sbridge: Seeking for: PCI ID 8086:3ca8
[ 2449.039028] EDAC DEBUG: sbridge_get_onedevice: Detected 8086:3ca8
[ 2449.045155] EDAC sbridge: Seeking for: PCI ID 8086:3ca8
...

Add a debug printk while at it to be able to catch the failure in the
future and dump driver version on successful load.

Fixes: d0585cd815fa ("sb_edac: Claim a different PCI device")
Acked-by: Aristeu Rozanski <aris@redhat.com>
Cc: Tony Luck <tony.luck@intel.com>
Acked-by: Andy Lutomirski <luto@amacapital.net>
Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 6 additions and 3 deletions Side-by-side Diff

drivers/edac/sb_edac.c
Diff comments   View file @ e7afafa
... ... @@ -2447,7 +2447,7 @@
2447 2447 rc = sbridge_get_all_devices(&num_mc, pci_dev_descr_ibridge_table);
2448 2448 type = IVY_BRIDGE;
2449 2449 break;
2450   - case PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA:
  2450 + case PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0:
2451 2451 rc = sbridge_get_all_devices(&num_mc, pci_dev_descr_sbridge_table);
2452 2452 type = SANDY_BRIDGE;
2453 2453 break;
2454 2454  
... ... @@ -2460,8 +2460,11 @@
2460 2460 type = BROADWELL;
2461 2461 break;
2462 2462 }
2463   - if (unlikely(rc < 0))
  2463 + if (unlikely(rc < 0)) {
  2464 + edac_dbg(0, "couldn't get all devices for 0x%x\n", pdev->device);
2464 2465 goto fail0;
  2466 + }
  2467 +
2465 2468 mc = 0;
2466 2469  
2467 2470 list_for_each_entry(sbridge_dev, &sbridge_edac_list, list) {
... ... @@ -2474,7 +2477,7 @@
2474 2477 goto fail1;
2475 2478 }
2476 2479  
2477   - sbridge_printk(KERN_INFO, "Driver loaded.\n");
  2480 + sbridge_printk(KERN_INFO, "%s\n", SBRIDGE_REVISION);
2478 2481  
2479 2482 mutex_unlock(&sbridge_edac_lock);
2480 2483 return 0;