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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 EB7DFC43603 for ; Thu, 19 Dec 2019 18:40:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDE7224689 for ; Thu, 19 Dec 2019 18:40:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780823; bh=Fz5pZTJj1XU79CoawPzRxAmavV5ocmrMz89V90ThoeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EC+/u5mnFkwsJF021mp2DvRx+NqJUr9P7oYiOnsOmkTD9sEmIZIT2s/SxofcnOoj0 rASaRcqCSQDL3GEL8vViD2ClkbabAdbw/VjVeYI+JS9xOf09CkJxL5D9f+71pMxB2l t2j+p17I9EUiAZFcg8AlQh5wGL4QTVs1Jd5gjE7Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728345AbfLSSkW (ORCPT ); Thu, 19 Dec 2019 13:40:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:59052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728071AbfLSSkV (ORCPT ); Thu, 19 Dec 2019 13:40:21 -0500 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 EA706222C2; Thu, 19 Dec 2019 18:40:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780821; bh=Fz5pZTJj1XU79CoawPzRxAmavV5ocmrMz89V90ThoeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V7n7iAx6VRw9c4f1Do1LYVhBGrU5QhXL4+iwfHwbftiO2leLvw5TcLM9wK5kXtIyp HwR4vtwgZ2XDHDQf0nEeaRMPb99qmwp/IOcKbQy5YH3LbnxW9RVHeUrj4oLBU6cRCQ 3SiwmkXf2Li6s+WtT3j4TJT8sqGIk+izqaIXzYZw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shirish S , Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , Tony Luck , Vishal Verma , x86-ml , Sasha Levin Subject: [PATCH 4.4 131/162] x86/MCE/AMD: Turn off MC4_MISC thresholding on all family 0x15 models Date: Thu, 19 Dec 2019 19:33:59 +0100 Message-Id: <20191219183215.753636483@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shirish S [ Upstream commit c95b323dcd3598dd7ef5005d6723c1ba3b801093 ] 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. ] Signed-off-by: Shirish S Signed-off-by: Borislav Petkov Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Tony Luck Cc: Vishal Verma Cc: x86-ml Link: https://lkml.kernel.org/r/1547106849-3476-2-git-send-email-shirish.s@amd.com Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/mcheck/mce.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 4b9cfdcc3aaa3..605395bbf0d82 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1536,11 +1536,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; -- 2.20.1