Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20251104-wip-mca-updates-v8-0-66c8eacf67b9@amd.com
This commit is contained in:
Yazen Ghannam 2025-11-04 14:55:42 +00:00 committed by Borislav Petkov (AMD)
parent 4efaec6e16
commit 3206b41604
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/x86/kernel/cpu/mce/amd.c
View File

@ -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);
}
}
/*