This change moves setting up PCI control that used to be done after driver tried to bind to present PCI devices into the probe() method, thus allowing probing to be done asynchronously, if needed.
To keep as close as possible to the previous behavior we explicitly check for presence of supported PCI devices; still we may end up with driver loaded even if we did not bind to any of them (for example if ECC is disabled). Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/edac/amd64_edac.c | 49 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index d23dad9..0b9e14f 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -16,11 +16,6 @@ module_param(ecc_enable_override, int, 0644); static struct msr __percpu *msrs; /* - * count successfully initialized driver instances for setup_pci_device() - */ -static atomic_t drv_instances = ATOMIC_INIT(0); - -/* * Valid scrub rates for the K8 hardware memory scrubber. We map the scrubbing * bandwidth to a valid bit pattern. The 'set' operation finds the 'matching- * or higher value'. @@ -2851,7 +2846,14 @@ static int init_one_instance(struct pci_dev *F2) pci_set_drvdata(F2, pvt); - atomic_inc(&drv_instances); + if (nid == 0 && !pci_ctl) { + pci_ctl = edac_pci_create_generic_ctl(&pvt->F2->dev, + EDAC_MOD_STR); + if (!pci_ctl) { + pr_warn("%s(): Unable to create PCI control\n", __func__); + pr_warn("%s(): PCI error report via EDAC not set\n", __func__); + } + } return 0; @@ -2895,6 +2897,9 @@ static void remove_one_instance(struct pci_dev *pdev) struct amd64_pvt *pvt = pci_get_drvdata(pdev); struct mem_ctl_info *mci; + if (pvt->mc_node_id == 0 && pci_ctl) + edac_pci_release_generic_ctl(pci_ctl); + /* Remove from EDAC CORE tracking list */ mci = edac_mc_del_mc(&pdev->dev); if (WARN_ON(!mci)) @@ -2939,26 +2944,6 @@ static struct pci_driver amd64_pci_driver = { .id_table = amd64_pci_table, }; -static void setup_pci_device(void) -{ - struct mem_ctl_info *mci; - struct amd64_pvt *pvt; - - if (pci_ctl) - return; - - mci = edac_mc_find(0); - if (!mci) - return; - - pvt = mci->pvt_info; - pci_ctl = edac_pci_create_generic_ctl(&pvt->F2->dev, EDAC_MOD_STR); - if (!pci_ctl) { - pr_warn("%s(): Unable to create PCI control\n", __func__); - pr_warn("%s(): PCI error report via EDAC not set\n", __func__); - } -} - static int __init amd64_edac_init(void) { int err = -ENODEV; @@ -2967,6 +2952,9 @@ static int __init amd64_edac_init(void) opstate_init(); + if (!pci_dev_present(amd64_pci_table)) + goto err_ret; + if (amd_cache_northbridges() < 0) goto err_ret; @@ -2979,21 +2967,12 @@ static int __init amd64_edac_init(void) if (err) goto err_pci; - err = -ENODEV; - if (!atomic_read(&drv_instances)) - goto err_no_instances; - - setup_pci_device(); - #ifdef CONFIG_X86_32 amd64_err("%s on 32-bit is unsupported. USE AT YOUR OWN RISK!\n", EDAC_MOD_STR); #endif return 0; -err_no_instances: - pci_unregister_driver(&amd64_pci_driver); - err_pci: msrs_free(msrs); msrs = NULL; -- 2.2.0.rc0.207.ga3a616c -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
