x86/mce/amd: apply missing quirks to family 15 models (v2)
Subsystems (2)
cover x86/mce/amd: apply missing quirks to family 15 models (v2)
Below patch series applies to family 15 CPU's of AMD platform, to address a consistent warning of:
"[Firmware Bug]: cpu 0, invalid threshold interrupt offset ..."
at every boot and every resume, which is misguiding as the reason is not a Firmware Bug but "MC4_MISC thresholding quirk" not being apporpriately applied.
Shirish S (3):
x86/mce/amd: apply MC4_MISC thresholding to all models of family 15 x86/mce/amd: carve out MC4_MISC thresholding quirk x86/mce/amd: apply MC4_MISC thresholding quirk in resume path
arch/x86/include/asm/mce.h | 1 + arch/x86/kernel/cpu/mce/amd.c | 6 ++++ arch/x86/kernel/cpu/mce/core.c | 65 +++++++++++++++++++++++------------------- 3 files changed, 42 insertions(+), 30 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 x86/mce/amd: apply MC4_MISC thresholding to all models of family 15
Its evident from various forums and logs that MC4_MISC thresholding is not supported for the family 15 processors, hence skip the x86_model check while applying quirk.
Changelog[v2]:
- reword commit message to adhere to coding standards
- remove check of model range
--- arch/x86/kernel/cpu/mce/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/mce/core.c +2 -3
@@ -1612,11 +1612,10 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) mce_flags.overflow_recov =1 ;/* -* Turn off MC4_MISC thresholding banks on those models since +* Turn off MC4_MISC thresholding banks on all models since * they're not supported there. */ -if (c->x86 ==0x15 && - (c->x86_model >=0x10 && c->x86_model <=0x1f )) { +if (c->x86 ==0x15 ) {int i;u64 hwcr;bool need_toggle;
Signature · 1 line
2.7.4
tip-bot for Shirish S
merge bot[tip:ras/core] x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models
x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models
Commit-ID: c95b323dcd3598dd7ef5005d6723c1ba3b801093 Gitweb: https://git.kernel.org/tip/c95b323dcd3598dd7ef5005d6723c1ba3b801093 Author: Shirish S <[email protected]> AuthorDate: Thu, 10 Jan 2019 07:54:40 +0000 Committer: Borislav Petkov <[email protected]> CommitDate: Tue, 15 Jan 2019 18:11:38 +0100
x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models
MC4_MISC thresholding is not supported on all family 0x15 processors, hence skip the x86_model check when applying the quirk.
[ bp: massage commit message. ]
--- arch/x86/kernel/cpu/mce/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/mce/core.c +2 -3
@@ -1612,11 +1612,10 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) mce_flags.overflow_recov =1 ;/* -* Turn off MC4_MISC thresholding banks on those models since +* Turn off MC4_MISC thresholding banks on all models since * they're not supported there. */ -if (c->x86 ==0x15 && - (c->x86_model >=0x10 && c->x86_model <=0x1f )) { +if (c->x86 ==0x15 ) {int i;u64 hwcr;bool need_toggle;
PATCH 2/3 x86/mce/amd: carve out MC4_MISC thresholding quirk
In reply to S, ShirishMC4_MISC thresholding quirk needs to be applied during S5 -> S0 and S3 -> S0 state transitions, which follow different code paths, hence carve it out so as to facilitate its application in both scenarios.
--- arch/x86/include/asm/mce.h | 1 + arch/x86/kernel/cpu/mce/core.c | 64 +++++++++++++++++++++++------------------- 2 files changed, 36 insertions(+), 29 deletions(-)
arch/x86/include/asm/mce.h +1 -0
@@ -216,6 +216,7 @@ int umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sys_addr);static inline void mce_amd_feature_init (struct cpuinfo_x86 *c) { }static inline int umc_normaddr_to_sysaddr (u64 norm_addr,u16 nid,u8 umc,u64 *sys_addr) {return -EINVAL ; };#endif +void quirk_fam15_mc4_misc_thresholding (void );static inline void mce_hygon_feature_init (struct cpuinfo_x86 *c) {return mce_amd_feature_init (c); }
arch/x86/kernel/cpu/mce/core.c +35 -29
76 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 3/3 x86/mce/amd: apply MC4_MISC thresholding quirk in resume path
In reply to S, ShirishThere are 2 code paths leading to mce_amd_feature_init() as below.
1) S5 -> S0: (boot)secondary_startup_64 -> start_kernel -> identify_boot_cpu -> identify_cpu ->mcheck_cpu_init (calls __mcheck_cpu_apply_quirks before) -> mce_amd_feature_init
2) S3 -> S0: (resume)syscore_resume -> mce_syscore_resume -> mce_amd_feature_init
Its clear that the quirks are not applied in S3 -> S0 path, hence apply the same.
--- arch/x86/kernel/cpu/mce/amd.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/x86/kernel/cpu/mce/amd.c +6 -0
@@ -552,6 +552,12 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)unsigned int bank, block, cpu =smp_processor_id ();int offset =-1 ; +/* +* mcheck_cpu_init() is not called when called by mce_syscore_resume(), +* hence re-apply quirks, to be on safer side. +*/ +quirk_fam15_mc4_misc_thresholding (); +for (bank =0 ; bank < mca_cfg.banks; ++bank) {if (mce_flags.smca)smca_configure (bank, cpu);
Signature · 1 line
2.7.4