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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 9339DC433E3 for ; Sat, 8 Aug 2020 23:38:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6729420855 for ; Sat, 8 Aug 2020 23:38:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596929927; bh=BHwwznOHRXqH0/INcL7kGleLn2SPdbjSB+EJBL7s76U=; h=From:To:Cc:Subject:Date:List-ID:From; b=pwMjgOWFbmv0AFZ73u6OdJO+fMHTaxTzB6A+xP689uR7zhi6l+YPTPGdrFr/6mHh/ Uttjq14K1uH5woliXJ+gz43j8tSE+T2vteOUrgnLxM4MJlbgMKbHYh2a/7EK5v86ir HwwclKwlKSW2GjlPlFFHNc2y7bYiW//rFAk61PIE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728382AbgHHXir (ORCPT ); Sat, 8 Aug 2020 19:38:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:53046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728380AbgHHXiq (ORCPT ); Sat, 8 Aug 2020 19:38:46 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AB4ED20716; Sat, 8 Aug 2020 23:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596929926; bh=BHwwznOHRXqH0/INcL7kGleLn2SPdbjSB+EJBL7s76U=; h=From:To:Cc:Subject:Date:From; b=PFrysYnySCAsw7G6JaZPiMTkc19x3VZgX+t6WfS0rMKoqxyuACuFYh9m1oQh1FbT+ zvSdbVsXCatRs53d1LQoZy+ycar282rcav4FmdiA4AnRO2cbzp6DwqXideN8AjTRnA Ve+3KB0Pr5TlC0ZFx4FrLuB7ofvZqmOmRQGJwBWw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhenzhong Duan , Borislav Petkov , Yazen Ghannam , Sasha Levin , linux-edac@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 01/40] x86/mce/inject: Fix a wrong assignment of i_mce.status Date: Sat, 8 Aug 2020 19:38:05 -0400 Message-Id: <20200808233844.3618823-1-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org From: Zhenzhong Duan [ Upstream commit 5d7f7d1d5e01c22894dee7c9c9266500478dca99 ] The original code is a nop as i_mce.status is or'ed with part of itself, fix it. Fixes: a1300e505297 ("x86/ras/mce_amd_inj: Trigger deferred and thresholding errors interrupts") Signed-off-by: Zhenzhong Duan Signed-off-by: Borislav Petkov Acked-by: Yazen Ghannam Link: https://lkml.kernel.org/r/20200611023238.3830-1-zhenzhong.duan@gmail.com Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/mce/inject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/inject.c index 1f30117b24ba7..eb2d41c1816d6 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -511,7 +511,7 @@ static void do_inject(void) */ if (inj_type == DFR_INT_INJ) { i_mce.status |= MCI_STATUS_DEFERRED; - i_mce.status |= (i_mce.status & ~MCI_STATUS_UC); + i_mce.status &= ~MCI_STATUS_UC; } /* -- 2.25.1