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 6B6E1C43381 for ; Fri, 22 Mar 2019 13:13:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F87C21873 for ; Fri, 22 Mar 2019 13:13:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553260402; bh=2gqonLl1HMjZM93JfXuKUBWjN1/UGsMXXFqtlL0iajw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=can+p2k+vH9nMloXFdofyBhBW0zj8ro3p6c0WBg3q48Cqg7oQlAX8gTnDqpqLF953 onOYS7wcFGG3eMbdw4HPUl4OeBJ0jjW5wCGdXAsdO8msmCqEsCoGz60+dPXi37MlB8 JMbw7Tr4/WDFgHFnDgW9bizWwR7KC0ntSwYvDv04= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729959AbfCVLag (ORCPT ); Fri, 22 Mar 2019 07:30:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:58526 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729699AbfCVLab (ORCPT ); Fri, 22 Mar 2019 07:30:31 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 86D3C2183E; Fri, 22 Mar 2019 11:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254231; bh=2gqonLl1HMjZM93JfXuKUBWjN1/UGsMXXFqtlL0iajw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cnhrWG629vmtsOClR/4tcsOP/lE0fX63ItkDiwIO7/mZ9r7hTz4LbW0zwu9Hvkr0t w0liDEDS+EfNJqFOIBHr9kJFBd96gux1DPG3t1Wz3cZV+OftEW4Jr8EA1E/ShnfNcT 091iGrPS98vGV5qW2++MqIGcwERJjBULb2FbIZXU= 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.4 072/230] x86/CPU/AMD: Set the CPB bit unconditionally on F17h Date: Fri, 22 Mar 2019 12:13:30 +0100 Message-Id: <20190322111241.726437234@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111236.796964179@linuxfoundation.org> References: <20190322111236.796964179@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.4-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 @@ -716,11 +716,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_mask <= 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); }