From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44D42C43381 for ; Fri, 8 Mar 2019 12:56:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 14ADD21019 for ; Fri, 8 Mar 2019 12:56:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552049783; bh=H0TK5MhkIzAJm0p4VtN/rK7NaXHCX4QwQJur2Mgi+jY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ni65YdUlKTFtXGbXNZgv3LD/2wxyAHLQrfhLjsB7QB1z2Fys2cvRg9x3SaEj9CGQG 1EY6kqsDF95gw9/qLmaOmg+ccPxMAoqlTY8+Mg54R6JWqqtGgwkpntpN0v40ckU1OP iuxD1WGtAywK70gSAEHokqJNfPSsVc17g3kKQ65o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727665AbfCHM4V (ORCPT ); Fri, 8 Mar 2019 07:56:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:60650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726665AbfCHM4T (ORCPT ); Fri, 8 Mar 2019 07:56:19 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A56FE20449; Fri, 8 Mar 2019 12:56:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552049779; bh=H0TK5MhkIzAJm0p4VtN/rK7NaXHCX4QwQJur2Mgi+jY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cjPT6EPFJF89O9oBurtO+0uSSx6NSnKh4Y1BHe7syPRaeP2SSCmGIiptMJV5L1leJ bM6tr2zv/qKDrPnMoMSSM7OhxpQrokTUpoyOftXjYHWh1FX2OrO1l44+gVsnUSJCCf Ta/wviXjiFkrDZCeGj4BaR2mxxgFUZsocXF+CxIo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiaxun Yang , Borislav Petkov , Tom Lendacky , "H. Peter Anvin" , Ingo Molnar , Sherry Hurwitz , Suravee Suthikulpanit , Thomas Gleixner , x86-ml Subject: [PATCH 4.20 60/76] x86/CPU/AMD: Set the CPB bit unconditionally on F17h Date: Fri, 8 Mar 2019 13:50:12 +0100 Message-Id: <20190308124916.922138845@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190308124914.789210760@linuxfoundation.org> References: <20190308124914.789210760@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiaxun Yang commit 0237199186e7a4aa5310741f0a6498a20c820fd7 upstream. 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 Signed-off-by: Borislav Petkov Acked-by: Tom Lendacky Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Sherry Hurwitz Cc: Suravee Suthikulpanit Cc: Thomas Gleixner Cc: x86-ml Link: https://lkml.kernel.org/r/20181120030018.5185-1-jiaxun.yang@flygoat.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/amd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -818,11 +818,9 @@ static void init_amd_bd(struct cpuinfo_x 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); }