patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

edac: ibecc: Simplify NMI handling

Browse source 
Refactor NMI handling making it clearer and fix return code for other
NMI source.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This commit is contained in:
Andrei Emeltchenko 2021-04-21 17:19:34 +03:00 committed by Anas Nashif
parent b6c75cfd34
commit b1d79776c7
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/edac/edac_ibecc.c
View file

@ -453,20 +453,14 @@ static bool handle_nmi(void)
uint8_t status; uint8_t status;
status = sys_in8(NMI_STS_CNT_REG); status = sys_in8(NMI_STS_CNT_REG);
if ((status & NMI_STS_SRC_SERR) == 0) {
if (status & NMI_STS_SRC_SERR == 0) { /* For other NMI sources return false to handle it by
LOG_DBG("Skip NMI, NMI_STS_CNT: 0x%x", status); * Zephyr exception handler
/**
* We should be able to find that this NMI we
* should not handle and return false. However this
* does not work for some older SKUs
*/ */
return true; return false;
} }
LOG_DBG("core: %d status 0x%x", arch_curr_cpu()->id, status); /* Re-enable SERR# NMI sources */
/* Re-enable */
status = (status & NMI_STS_MASK_EN) | NMI_STS_SERR_EN; status = (status & NMI_STS_MASK_EN) | NMI_STS_SERR_EN;
sys_out8(status, NMI_STS_CNT_REG); sys_out8(status, NMI_STS_CNT_REG);
@ -488,18 +482,18 @@ bool z_x86_do_kernel_nmi(const z_arch_esf_t *esf)
key = k_spin_lock(&nmi_lock); key = k_spin_lock(&nmi_lock);
if (!handle_nmi()) {
/* Indicate that we do not handle this NMI */
ret = false;
goto out;
}
/* Skip the same NMI handling for other cores and return handled */ /* Skip the same NMI handling for other cores and return handled */
if (arch_curr_cpu()->id != 0) { if (arch_curr_cpu()->id != 0) {
ret = true; ret = true;
goto out; goto out;
} }
if (!handle_nmi()) {
/* Indicate that we do not handle this NMI */
ret = false;
goto out;
}
if (edac_ecc_error_log_get(dev, &ecclog) != 0) { if (edac_ecc_error_log_get(dev, &ecclog) != 0) {
goto out; goto out;
} }