soc/intel/cmn/cpu: Add function to disable 3-strike CATERR

In Intel designs, internal processor errors, such as a processor
instruction retirement watchdog timeout (also known as a 3-strike
timeout) will cause a CATERR assertion and can only be recovered from by
a system reset.

This patch prevents the Three Strike Counter from incrementing (as per
Intel EDS doc: 630094), which would help to disable Machine Check Catastrophic error. It will provide more opportunity to collect more useful CPU traces for debugging.

TEST=Able to build and boot google/rex.

Signed-off-by: Subrata Banik <subratabanik@google.com>
Change-Id: I286037cb00603f5fbc434cd1facc5e906718ba2f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74158
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com>
This commit is contained in:
Subrata Banik 2023-04-01 16:27:55 +05:30 committed by Lean Sheng Tan
parent f5ae1dd1be
commit 39b7665abe
3 changed files with 17 additions and 0 deletions

View File

@ -569,3 +569,12 @@ unsigned int smbios_cpu_get_max_speed_mhz(void)
{ {
return cpu_get_max_turbo_ratio() * CONFIG_CPU_BCLK_MHZ; return cpu_get_max_turbo_ratio() * CONFIG_CPU_BCLK_MHZ;
} }
void disable_three_strike_error(void)
{
msr_t msr;
msr = rdmsr(MSR_PREFETCH_CTL);
msr.lo = msr.lo | DISABLE_CPU_ERROR;
wrmsr(MSR_PREFETCH_CTL, msr);
}

View File

@ -222,4 +222,11 @@ bool is_sgx_supported(void);
* Returns true if Key Locker feature is supported otherwise false. * Returns true if Key Locker feature is supported otherwise false.
*/ */
bool is_keylocker_supported(void); bool is_keylocker_supported(void);
/*
* This function prevents the Three Strike Counter from incrementing.
* It helps to collect more useful CPU traces for debugging.
*/
void disable_three_strike_error(void);
#endif /* SOC_INTEL_COMMON_BLOCK_CPULIB_H */ #endif /* SOC_INTEL_COMMON_BLOCK_CPULIB_H */

View File

@ -35,6 +35,7 @@
#define MSR_PREFETCH_CTL 0x1a4 #define MSR_PREFETCH_CTL 0x1a4
#define PREFETCH_L1_DISABLE (1 << 0) #define PREFETCH_L1_DISABLE (1 << 0)
#define PREFETCH_L2_DISABLE (1 << 2) #define PREFETCH_L2_DISABLE (1 << 2)
#define DISABLE_CPU_ERROR (1 << 11)
#define MSR_MISC_PWR_MGMT 0x1aa #define MSR_MISC_PWR_MGMT 0x1aa
#define MISC_PWR_MGMT_EIST_HW_DIS (1 << 0) #define MISC_PWR_MGMT_EIST_HW_DIS (1 << 0)
#define MISC_PWR_MGMT_ISST_EN (1 << 6) #define MISC_PWR_MGMT_ISST_EN (1 << 6)