lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

EDAC, MCE: Enable MCE decoding on F15h

Browse Source 
Now that everything is inplace, enable MCE decoding on F15h. Make
initcall routine a bit more readable.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
This commit is contained in:
Borislav Petkov
2010-09-22 17:44:51 +02:00
parent 1b07ca47ff
commit bad11e0318
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/edac/mce_amd.c
View File

@@ -836,18 +836,21 @@ static struct notifier_block amd_mce_dec_nb = {
static int __init mce_amd_init(void) static int __init mce_amd_init(void)
{ {
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD) struct cpuinfo_x86 *c = &boot_cpu_data;
if (c->x86_vendor != X86_VENDOR_AMD)
return 0; return 0;
if ((boot_cpu_data.x86 < 0xf || boot_cpu_data.x86 > 0x12) && if ((c->x86 < 0xf || c->x86 > 0x12) &&
(boot_cpu_data.x86 != 0x14 || boot_cpu_data.x86_model > 0xf)) (c->x86 != 0x14 || c->x86_model > 0xf) &&
(c->x86 != 0x15 || c->x86_model > 0xf))
return 0; return 0;
fam_ops = kzalloc(sizeof(struct amd_decoder_ops), GFP_KERNEL); fam_ops = kzalloc(sizeof(struct amd_decoder_ops), GFP_KERNEL);
if (!fam_ops) if (!fam_ops)
return -ENOMEM; return -ENOMEM;
switch (boot_cpu_data.x86) { switch (c->x86) {
case 0xf: case 0xf:
fam_ops->dc_mce = k8_dc_mce; fam_ops->dc_mce = k8_dc_mce;
fam_ops->ic_mce = k8_ic_mce; fam_ops->ic_mce = k8_ic_mce;
@@ -887,8 +890,7 @@ static int __init mce_amd_init(void)
break; break;
default: default:
printk(KERN_WARNING "Huh? What family is that: %d?!\n", printk(KERN_WARNING "Huh? What family is that: %d?!\n", c->x86);
boot_cpu_data.x86);
kfree(fam_ops); kfree(fam_ops);
return -EINVAL; return -EINVAL;
} }