diff options
author | Borislav Petkov <bp@suse.de> | 2017-09-07 13:08:21 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-09-15 05:30:53 -0400 |
commit | f7f3dc00f61261cdc9ccd8b886f21bc4dffd6fd9 (patch) | |
tree | 7891c49328f3ca3eb3fad5f7334535da980e55be | |
parent | 711aab1dbb324d321e3d84368a435a78908c7bce (diff) |
x86/cpu/AMD: Fix erratum 1076 (CPB bit)
CPUID Fn8000_0007_EDX[CPB] is wrongly 0 on models up to B1. But they do
support CPB (AMD's Core Performance Boosting cpufreq CPU feature), so fix that.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sherry Hurwitz <sherry.hurwitz@amd.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170907170821.16021-1-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/kernel/cpu/amd.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 9862e2cd6d93..d58184b7cd44 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -763,6 +763,16 @@ static void init_amd_bd(struct cpuinfo_x86 *c) | |||
763 | } | 763 | } |
764 | } | 764 | } |
765 | 765 | ||
766 | static void init_amd_zn(struct cpuinfo_x86 *c) | ||
767 | { | ||
768 | /* | ||
769 | * Fix erratum 1076: CPB feature bit not being set in CPUID. It affects | ||
770 | * all up to and including B1. | ||
771 | */ | ||
772 | if (c->x86_model <= 1 && c->x86_mask <= 1) | ||
773 | set_cpu_cap(c, X86_FEATURE_CPB); | ||
774 | } | ||
775 | |||
766 | static void init_amd(struct cpuinfo_x86 *c) | 776 | static void init_amd(struct cpuinfo_x86 *c) |
767 | { | 777 | { |
768 | early_init_amd(c); | 778 | early_init_amd(c); |
@@ -791,6 +801,7 @@ static void init_amd(struct cpuinfo_x86 *c) | |||
791 | case 0x10: init_amd_gh(c); break; | 801 | case 0x10: init_amd_gh(c); break; |
792 | case 0x12: init_amd_ln(c); break; | 802 | case 0x12: init_amd_ln(c); break; |
793 | case 0x15: init_amd_bd(c); break; | 803 | case 0x15: init_amd_bd(c); break; |
804 | case 0x17: init_amd_zn(c); break; | ||
794 | } | 805 | } |
795 | 806 | ||
796 | /* Enable workaround for FXSAVE leak */ | 807 | /* Enable workaround for FXSAVE leak */ |