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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 69254C43331 for ; Sun, 10 Nov 2019 02:51:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E16922794 for ; Sun, 10 Nov 2019 02:51:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354294; bh=nJdG7PaG0m39H++CcGd3vlTX4gQeqTkJ70QPMwYHUBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EzYCzCpqz4itqnXUejEnIVBC7/n0955L5G3MIZg0E7ovPpIs69B99A5ALI0iRCnUv 8+DygGJn1dSGGzdLtF029CoRG60dJAD/QO1kEtq+O1Uot1Nd2/68bnQw2Jf8IS1ZYP RxNXyytZtITDKiwT0vHSbgbC8C9Kq3YYxup80UL0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730015AbfKJCvd (ORCPT ); Sat, 9 Nov 2019 21:51:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:35716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729936AbfKJCvT (ORCPT ); Sat, 9 Nov 2019 21:51:19 -0500 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 61D8122594; Sun, 10 Nov 2019 02:51:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354278; bh=nJdG7PaG0m39H++CcGd3vlTX4gQeqTkJ70QPMwYHUBo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TB1rYHJF8+qJLvu79In3BtXEM4HOao0e7JwyrB20O2k69J/YuiNffwAPBhPzHRSvp 5nDXFVBocH3O0n7r2juHd8Rd4Wha2v6I80pSar1WAzaOxtlb0HXANZH2cOrjYIoJLQ JkxSXg05c3qPgNkpFm7JcgbKuIaWOIo17GBUAaHE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Matthew Whitehead , Borislav Petkov , Andy Lutomirski , Greg Kroah-Hartman , "H. Peter Anvin" , Ingo Molnar , Jia Zhang , Peter Zijlstra , Philippe Ombredanne , Thomas Gleixner , Sasha Levin Subject: [PATCH AUTOSEL 4.4 22/40] x86/CPU: Use correct macros for Cyrix calls Date: Sat, 9 Nov 2019 21:50:14 -0500 Message-Id: <20191110025032.827-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191110025032.827-1-sashal@kernel.org> References: <20191110025032.827-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Whitehead [ Upstream commit 03b099bdcdf7125d4a63dc9ddeefdd454e05123d ] There are comments in processor-cyrix.h advising you to _not_ make calls using the deprecated macros in this style: setCx86_old(CX86_CCR4, getCx86_old(CX86_CCR4) | 0x80); This is because it expands the macro into a non-functioning calling sequence. The calling order must be: outb(CX86_CCR2, 0x22); inb(0x23); >From the comments: * When using the old macros a line like * setCx86(CX86_CCR2, getCx86(CX86_CCR2) | 0x88); * gets expanded to: * do { * outb((CX86_CCR2), 0x22); * outb((({ * outb((CX86_CCR2), 0x22); * inb(0x23); * }) | 0x88), 0x23); * } while (0); The new macros fix this problem, so use them instead. Signed-off-by: Matthew Whitehead Signed-off-by: Borislav Petkov Reviewed-by: Andy Lutomirski Cc: Greg Kroah-Hartman Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Jia Zhang Cc: Peter Zijlstra Cc: Philippe Ombredanne Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20180921212041.13096-2-tedheadster@gmail.com Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/cyrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c index 6e4e4191abb56..151625a83d9e2 100644 --- a/arch/x86/kernel/cpu/cyrix.c +++ b/arch/x86/kernel/cpu/cyrix.c @@ -433,7 +433,7 @@ static void cyrix_identify(struct cpuinfo_x86 *c) /* enable MAPEN */ setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable cpuid */ - setCx86_old(CX86_CCR4, getCx86_old(CX86_CCR4) | 0x80); + setCx86(CX86_CCR4, getCx86(CX86_CCR4) | 0x80); /* disable MAPEN */ setCx86(CX86_CCR3, ccr3); local_irq_restore(flags); -- 2.20.1