Commit 86e9f9d6 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

EDAC/mce_amd: Make fam_ops static global 



... and do not kmalloc a three-pointer struct. Which simplifies
mce_amd_init() a bit.

No functional changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200116163403.GF27148@zn.tnic
parent dcd01394

drivers/edac/mce_amd.c

+29 −39
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#include "mce_amd.h"



static struct amd_decoder_ops *fam_ops;

static struct amd_decoder_ops fam_ops;



static u8 xec_mask	 = 0xf;
@@ -583,7 +583,7 @@ static void decode_mc0_mce(struct mce *m) 
					    : (xec ? "multimatch" : "parity")));

			return;

		}

	} else if (fam_ops->mc0_mce(ec, xec))

	} else if (fam_ops.mc0_mce(ec, xec))

		;

	else

		pr_emerg(HW_ERR "Corrupted MC0 MCE info?\n");
@@ -697,7 +697,7 @@ static void decode_mc1_mce(struct mce *m) 
			pr_cont("Hardware Assert.\n");

		else

			goto wrong_mc1_mce;

	} else if (fam_ops->mc1_mce(ec, xec))

	} else if (fam_ops.mc1_mce(ec, xec))

		;

	else

		goto wrong_mc1_mce;
@@ -831,7 +831,7 @@ static void decode_mc2_mce(struct mce *m) 


	pr_emerg(HW_ERR "MC2 Error: ");



	if (!fam_ops->mc2_mce(ec, xec))

	if (!fam_ops.mc2_mce(ec, xec))

		pr_cont(HW_ERR "Corrupted MC2 MCE info?\n");

}
@@ -1130,7 +1130,8 @@ amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data) 
	if (m->tsc)

		pr_emerg(HW_ERR "TSC: %llu\n", m->tsc);



	if (!fam_ops)

	/* Doesn't matter which member to test. */

	if (!fam_ops.mc0_mce)

		goto err_code;



	switch (m->bank) {
@@ -1185,10 +1186,6 @@ static int __init mce_amd_init(void) 
	    c->x86_vendor != X86_VENDOR_HYGON)

		return -ENODEV;



	fam_ops = kzalloc(sizeof(struct amd_decoder_ops), GFP_KERNEL);

	if (!fam_ops)

		return -ENOMEM;



	if (boot_cpu_has(X86_FEATURE_SMCA)) {

		xec_mask = 0x3f;

		goto out;
@@ -1196,59 +1193,58 @@ static int __init mce_amd_init(void) 


	switch (c->x86) {

	case 0xf:

		fam_ops->mc0_mce = k8_mc0_mce;

		fam_ops->mc1_mce = k8_mc1_mce;

		fam_ops->mc2_mce = k8_mc2_mce;

		fam_ops.mc0_mce = k8_mc0_mce;

		fam_ops.mc1_mce = k8_mc1_mce;

		fam_ops.mc2_mce = k8_mc2_mce;

		break;



	case 0x10:

		fam_ops->mc0_mce = f10h_mc0_mce;

		fam_ops->mc1_mce = k8_mc1_mce;

		fam_ops->mc2_mce = k8_mc2_mce;

		fam_ops.mc0_mce = f10h_mc0_mce;

		fam_ops.mc1_mce = k8_mc1_mce;

		fam_ops.mc2_mce = k8_mc2_mce;

		break;



	case 0x11:

		fam_ops->mc0_mce = k8_mc0_mce;

		fam_ops->mc1_mce = k8_mc1_mce;

		fam_ops->mc2_mce = k8_mc2_mce;

		fam_ops.mc0_mce = k8_mc0_mce;

		fam_ops.mc1_mce = k8_mc1_mce;

		fam_ops.mc2_mce = k8_mc2_mce;

		break;



	case 0x12:

		fam_ops->mc0_mce = f12h_mc0_mce;

		fam_ops->mc1_mce = k8_mc1_mce;

		fam_ops->mc2_mce = k8_mc2_mce;

		fam_ops.mc0_mce = f12h_mc0_mce;

		fam_ops.mc1_mce = k8_mc1_mce;

		fam_ops.mc2_mce = k8_mc2_mce;

		break;



	case 0x14:

		fam_ops->mc0_mce = cat_mc0_mce;

		fam_ops->mc1_mce = cat_mc1_mce;

		fam_ops->mc2_mce = k8_mc2_mce;

		fam_ops.mc0_mce = cat_mc0_mce;

		fam_ops.mc1_mce = cat_mc1_mce;

		fam_ops.mc2_mce = k8_mc2_mce;

		break;



	case 0x15:

		xec_mask = c->x86_model == 0x60 ? 0x3f : 0x1f;



		fam_ops->mc0_mce = f15h_mc0_mce;

		fam_ops->mc1_mce = f15h_mc1_mce;

		fam_ops->mc2_mce = f15h_mc2_mce;

		fam_ops.mc0_mce = f15h_mc0_mce;

		fam_ops.mc1_mce = f15h_mc1_mce;

		fam_ops.mc2_mce = f15h_mc2_mce;

		break;



	case 0x16:

		xec_mask = 0x1f;

		fam_ops->mc0_mce = cat_mc0_mce;

		fam_ops->mc1_mce = cat_mc1_mce;

		fam_ops->mc2_mce = f16h_mc2_mce;

		fam_ops.mc0_mce = cat_mc0_mce;

		fam_ops.mc1_mce = cat_mc1_mce;

		fam_ops.mc2_mce = f16h_mc2_mce;

		break;



	case 0x17:

	case 0x18:

		pr_warn("Decoding supported only on Scalable MCA processors.\n");

		goto err_out;

		break;

		return -EINVAL;



	default:

		printk(KERN_WARNING "Huh? What family is it: 0x%x?!\n", c->x86);

		goto err_out;

		return -EINVAL;

	}



out:
@@ -1257,11 +1253,6 @@ static int __init mce_amd_init(void) 
	mce_register_decode_chain(&amd_mce_dec_nb);



	return 0;



err_out:

	kfree(fam_ops);

	fam_ops = NULL;

	return -EINVAL;

}

early_initcall(mce_amd_init);
@@ -1269,7 +1260,6 @@ early_initcall(mce_amd_init); 
static void __exit mce_amd_exit(void)

{

	mce_unregister_decode_chain(&amd_mce_dec_nb);

	kfree(fam_ops);

}



MODULE_DESCRIPTION("AMD MCE decoder");