adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 11:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

amd64_edac: make driver loading more robust

Browse source 
Currently, the module does not initialize fully when the DIMMs aren't
ECC but remains still loaded. Propagate the error when no instance of
the driver is properly initialized and prevent further loading.

Reorganize and polish error handling in amd64_edac_init() while at it.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
This commit is contained in:
Borislav Petkov 2009-12-21 18:13:01 +01:00
parent 8f68ed9728
commit 56b34b91e2
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/edac/amd64_edac.c
View file

@ -3014,25 +3014,29 @@ static void amd64_setup_pci_device(void)
static int __init amd64_edac_init(void) static int __init amd64_edac_init(void)
{ {
int nb, err = -ENODEV; int nb, err = -ENODEV;
bool load_ok = false;
edac_printk(KERN_INFO, EDAC_MOD_STR, EDAC_AMD64_VERSION "\n"); edac_printk(KERN_INFO, EDAC_MOD_STR, EDAC_AMD64_VERSION "\n");
opstate_init(); opstate_init();
if (cache_k8_northbridges() < 0) if (cache_k8_northbridges() < 0)
return err; goto err_ret;
msrs = msrs_alloc(); msrs = msrs_alloc();
if (!msrs)
goto err_ret;
err = pci_register_driver(&amd64_pci_driver); err = pci_register_driver(&amd64_pci_driver);
if (err) if (err)
return err; goto err_pci;
/* /*
* At this point, the array 'pvt_lookup[]' contains pointers to alloc'd * At this point, the array 'pvt_lookup[]' contains pointers to alloc'd
* amd64_pvt structs. These will be used in the 2nd stage init function * amd64_pvt structs. These will be used in the 2nd stage init function
* to finish initialization of the MC instances. * to finish initialization of the MC instances.
*/ */
err = -ENODEV;
for (nb = 0; nb < num_k8_northbridges; nb++) { for (nb = 0; nb < num_k8_northbridges; nb++) {
if (!pvt_lookup[nb]) if (!pvt_lookup[nb])
continue; continue;
@ -3040,16 +3044,21 @@ static int __init amd64_edac_init(void)
err = amd64_init_2nd_stage(pvt_lookup[nb]); err = amd64_init_2nd_stage(pvt_lookup[nb]);
if (err) if (err)
goto err_2nd_stage; goto err_2nd_stage;
load_ok = true;
} }
amd64_setup_pci_device(); if (load_ok) {
amd64_setup_pci_device();
return 0; return 0;
}
err_2nd_stage: err_2nd_stage:
debugf0("2nd stage failed\n");
pci_unregister_driver(&amd64_pci_driver); pci_unregister_driver(&amd64_pci_driver);
err_pci:
msrs_free(msrs);
msrs = NULL;
err_ret:
return err; return err;
} }