Commit 5ad21a24 authored by Yazen Ghannam's avatar Yazen Ghannam Committed by Borislav Petkov (AMD)
Browse files

x86/mce: Rename mce_setup() to mce_prep_record() 



There is no MCE "setup" done in mce_setup(). Rather, this function initializes
and prepares an MCE record.

Rename the function to highlight what it does.

No functional change is intended.

Suggested-by: default avatarBorislav Petkov <bp@alien8.de>
Signed-off-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarNikolay Borisov <nik.borisov@suse.com>
Link: https://lore.kernel.org/r/20240730182958.4117158-2-yazen.ghannam@amd.com


Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
parent 8400291e

arch/x86/include/asm/mce.h

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static inline int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, 
					     u64 lapic_id) { return -EINVAL; }

#endif



void mce_setup(struct mce *m);

void mce_prep_record(struct mce *m);

void mce_log(struct mce *m);

DECLARE_PER_CPU(struct device *, mce_device);

arch/x86/kernel/cpu/mce/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ static void __log_error(unsigned int bank, u64 status, u64 addr, u64 misc) 
{

	struct mce m;



	mce_setup(&m);

	mce_prep_record(&m);



	m.status = status;

	m.misc   = misc;

arch/x86/kernel/cpu/mce/apei.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err) 
	else

		lsb = PAGE_SHIFT;



	mce_setup(&m);

	mce_prep_record(&m);

	m.bank = -1;

	/* Fake a memory read error with unknown channel */

	m.status = MCI_STATUS_VAL | MCI_STATUS_EN | MCI_STATUS_ADDRV | MCI_STATUS_MISCV | 0x9f;
@@ -97,7 +97,7 @@ int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, u64 lapic_id) 
	if (ctx_info->reg_arr_size < 48)

		return -EINVAL;



	mce_setup(&m);

	mce_prep_record(&m);



	m.extcpu = -1;

	m.socketid = -1;

arch/x86/kernel/cpu/mce/core.c

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static struct irq_work mce_irq_work; 
BLOCKING_NOTIFIER_HEAD(x86_mce_decoder_chain);



/* Do initial initialization of a struct mce */

void mce_setup(struct mce *m)

void mce_prep_record(struct mce *m)

{

	memset(m, 0, sizeof(struct mce));

	m->cpu = m->extcpu = smp_processor_id();
@@ -436,11 +436,11 @@ static noinstr void mce_wrmsrl(u32 msr, u64 v) 
static noinstr void mce_gather_info(struct mce *m, struct pt_regs *regs)

{

	/*

	 * Enable instrumentation around mce_setup() which calls external

	 * Enable instrumentation around mce_prep_record() which calls external

	 * facilities.

	 */

	instrumentation_begin();

	mce_setup(m);

	mce_prep_record(m);

	instrumentation_end();



	m->mcgstatus = mce_rdmsrl(MSR_IA32_MCG_STATUS);