aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-08-19 14:51:00 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-24 09:20:38 -0400
commit54a08ab153cf38a08ccce7544d58c819ad02dd18 (patch)
treebddef98c0d5d2a492916aab77d1399c7d3171e03 /drivers/edac
parentaccf74fff36315a31dc7319dae2927af06e9296f (diff)
i7core_edac: Don't do the legacy PCI probe by default
The legacy PCI probe sometimes cause hangs. Better to have it disabled by default, and have a parameter to enable it. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/i7core_edac.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 8e789a2e35d6..a76a4c067858 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -44,6 +44,9 @@ static LIST_HEAD(i7core_edac_list);
44static DEFINE_MUTEX(i7core_edac_lock); 44static DEFINE_MUTEX(i7core_edac_lock);
45static int probed; 45static int probed;
46 46
47static int use_pci_fixup;
48module_param(use_pci_fixup, int, 0444);
49MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices");
47/* 50/*
48 * This is used for Nehalem-EP and Nehalem-EX devices, where the non-core 51 * This is used for Nehalem-EP and Nehalem-EX devices, where the non-core
49 * registers start at bus 255, and are not reported by BIOS. 52 * registers start at bus 255, and are not reported by BIOS.
@@ -1257,6 +1260,7 @@ static void __init i7core_xeon_pci_fixup(const struct pci_id_table *table)
1257{ 1260{
1258 struct pci_dev *pdev = NULL; 1261 struct pci_dev *pdev = NULL;
1259 int i; 1262 int i;
1263
1260 /* 1264 /*
1261 * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core pci buses 1265 * On Xeon 55xx, the Intel Quckpath Arch Generic Non-core pci buses
1262 * aren't announced by acpi. So, we need to use a legacy scan probing 1266 * aren't announced by acpi. So, we need to use a legacy scan probing
@@ -2126,7 +2130,8 @@ static int __init i7core_init(void)
2126 /* Ensure that the OPSTATE is set correctly for POLL or NMI */ 2130 /* Ensure that the OPSTATE is set correctly for POLL or NMI */
2127 opstate_init(); 2131 opstate_init();
2128 2132
2129 i7core_xeon_pci_fixup(pci_dev_table); 2133 if (use_pci_fixup)
2134 i7core_xeon_pci_fixup(pci_dev_table);
2130 2135
2131 pci_rc = pci_register_driver(&i7core_driver); 2136 pci_rc = pci_register_driver(&i7core_driver);
2132 2137