Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afdf344e authored by Aravind Gopalakrishnan's avatar Aravind Gopalakrishnan Committed by Borislav Petkov
Browse files

x86/mce/amd: Factor out logging mechanism 



Refactor the code here to setup struct mce and call mce_log() to log
the error. We're going to reuse this in a later patch as part of the
deferred error interrupt enablement.

No functional change is introduced.

Suggested-by: default avatarBorislav Petkov <bp@alien8.de>
Signed-off-by: default avatarAravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: x86-ml <x86@kernel.org>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1430913538-1415-2-git-send-email-Aravind.Gopalakrishnan@amd.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 5ebe6afa

arch/x86/kernel/cpu/mcheck/mce_amd.c

+23 −10
Original line number Diff line number Diff line
@@ -264,6 +264,27 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) 
	}

}



static void __log_error(unsigned int bank, bool threshold_err, u64 misc)

{

	struct mce m;

	u64 status;



	rdmsrl(MSR_IA32_MCx_STATUS(bank), status);

	if (!(status & MCI_STATUS_VAL))

		return;



	mce_setup(&m);



	m.status = status;

	m.bank = bank;

	if (threshold_err)

		m.misc = misc;



	mce_log(&m);



	wrmsrl(MSR_IA32_MCx_STATUS(bank), 0);

}



/*

 * APIC Interrupt Handler

 */
@@ -273,12 +294,12 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) 
 * the interrupt goes off when error_count reaches threshold_limit.

 * the handler will simply log mcelog w/ software defined bank number.

 */



static void amd_threshold_interrupt(void)

{

	u32 low = 0, high = 0, address = 0;

	int cpu = smp_processor_id();

	unsigned int bank, block;

	struct mce m;



	/* assume first bank caused it */

	for (bank = 0; bank < mca_cfg.banks; ++bank) {
@@ -321,15 +342,7 @@ static void amd_threshold_interrupt(void) 
	return;



log:

	mce_setup(&m);

	rdmsrl(MSR_IA32_MCx_STATUS(bank), m.status);

	if (!(m.status & MCI_STATUS_VAL))

		return;

	m.misc = ((u64)high << 32) | low;

	m.bank = bank;

	mce_log(&m);



	wrmsrl(MSR_IA32_MCx_STATUS(bank), 0);

	__log_error(bank, true, ((u64)high << 32) | low);

}



/*