On Fri, Jan 18, 2019 at 07:48:59AM -0800, tip-bot for Jiaxun Yang wrote:
> Commit-ID: 0237199186e7a4aa5310741f0a6498a20c820fd7
> Gitweb:
> https://git.kernel.org/tip/0237199186e7a4aa5310741f0a6498a20c820fd7
> Author: Jiaxun Yang <jiaxun.y...@flygoat.com>
> AuthorDate: Tue, 20 Nov 2018 11:00:18 +0800
> Committer: Borislav Petkov <b...@suse.de>
> CommitDate: Fri, 18 Jan 2019 16:44:03 +0100
>
> x86/CPU/AMD: Set the CPB bit unconditionally on F17h
>
> Some F17h models do not have CPB set in CPUID even though the CPU
> supports it. Set the feature bit unconditionally on all F17h.
>
> [ bp: Rewrite commit message and patch. ]
>
> Signed-off-by: Jiaxun Yang <jiaxun.y...@flygoat.com>
> Signed-off-by: Borislav Petkov <b...@suse.de>
> Acked-by: Tom Lendacky <thomas.lenda...@amd.com>
> Cc: "H. Peter Anvin" <h...@zytor.com>
> Cc: Ingo Molnar <mi...@redhat.com>
> Cc: Sherry Hurwitz <sherry.hurw...@amd.com>
> Cc: Suravee Suthikulpanit <suravee.suthikulpa...@amd.com>
> Cc: Thomas Gleixner <t...@linutronix.de>
> Cc: x86-ml <x...@kernel.org>
> Link: https://lkml.kernel.org/r/20181120030018.5185-1-jiaxun.y...@flygoat.com
> ---
> arch/x86/kernel/cpu/amd.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index 69f6bbb41be0..01004bfb1a1b 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -819,11 +819,9 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
> static void init_amd_zn(struct cpuinfo_x86 *c)
> {
> set_cpu_cap(c, X86_FEATURE_ZEN);
> - /*
> - * Fix erratum 1076: CPB feature bit not being set in CPUID. It affects
> - * all up to and including B1.
> - */
> - if (c->x86_model <= 1 && c->x86_stepping <= 1)
> +
> + /* Fix erratum 1076: CPB feature bit not being set in CPUID. */
> + if (!cpu_has(c, X86_FEATURE_CPB))
> set_cpu_cap(c, X86_FEATURE_CPB);
Stable folks, please take this one above into those stable trees which
have backported
f7f3dc00f612 ("x86/cpu/AMD: Fix erratum 1076 (CPB bit)")
Thx.
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
