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

x86/mce/amd: Remove redundant reset_block() 



Many of the checks in reset_block() are done again in the block reset
function. So drop the redundant checks.

Signed-off-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20251104-wip-mca-updates-v8-0-66c8eacf67b9@amd.com
parent 4efaec6e

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

+7 −21
Original line number Diff line number Diff line
@@ -812,29 +812,11 @@ static void amd_deferred_error_interrupt(void) 
	machine_check_poll(MCP_TIMESTAMP, &this_cpu_ptr(&mce_amd_data)->dfr_intr_banks);

}



static void reset_block(struct threshold_block *block)

{

	struct thresh_restart tr;

	u32 low = 0, high = 0;



	if (!block)

		return;



	if (rdmsr_safe(block->address, &low, &high))

		return;



	if (!(high & MASK_OVERFLOW_HI))

		return;



	memset(&tr, 0, sizeof(tr));

	tr.b = block;

	threshold_restart_block(&tr);

}



static void amd_reset_thr_limit(unsigned int bank)

{

	struct threshold_bank **bp = this_cpu_read(threshold_banks);

	struct threshold_block *block, *tmp;

	struct thresh_restart tr;



	/*

	 * Validate that the threshold bank has been initialized already. The
@@ -844,8 +826,12 @@ static void amd_reset_thr_limit(unsigned int bank) 
	if (!bp || !bp[bank])

		return;



	list_for_each_entry_safe(block, tmp, &bp[bank]->miscj, miscj)

		reset_block(block);

	memset(&tr, 0, sizeof(tr));



	list_for_each_entry_safe(block, tmp, &bp[bank]->miscj, miscj) {

		tr.b = block;

		threshold_restart_block(&tr);

	}

}



/*