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 7F382C432C0 for ; Tue, 19 Nov 2019 05:38:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5229D222A4 for ; Tue, 19 Nov 2019 05:38:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141906; bh=yTksp1ZKXV82zjImAK+llrk3ZT07sr7e/NIZf/IX/ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PB/BZfahE9ojGqPxylv6rioaJB0ejkrOS5etwKBgdXvChlQAV7jfQqEioLzL7jALy ibRhpbA/XsRFqomcvsUfVlnsAaLwGRpvrJzZ7t4D0ymmtCtINuDeQ+BthF5aGdC4Rl x1MIQvbbfhtOWTItN7gYIyTUYJ+i7nYZvh7kpqv8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730199AbfKSFiY (ORCPT ); Tue, 19 Nov 2019 00:38:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:60320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730182AbfKSFiU (ORCPT ); Tue, 19 Nov 2019 00:38:20 -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 EC999208C3; Tue, 19 Nov 2019 05:38:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141900; bh=yTksp1ZKXV82zjImAK+llrk3ZT07sr7e/NIZf/IX/ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l90v3VWAeg9mQAuvVwRjbdyAUmsCeWRsM3QbshTD5ALEuuQvVwVYk2bHkaxUivNVB sBZjryWJSkq8bB1Ym1zwrsMvElbL2vrwvCvzjNzvDhbrjDrUIzwHYSlcpuZpXUErIw IdfXpYshtH5uV+Nrdni8hyqMEC1PJy2JyOo8CNJ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthew Whitehead , Borislav Petkov , Andy Lutomirski , "H. Peter Anvin" , Ingo Molnar , Jia Zhang , Peter Zijlstra , Philippe Ombredanne , Thomas Gleixner , Sasha Levin Subject: [PATCH 4.19 320/422] x86/CPU: Use correct macros for Cyrix calls Date: Tue, 19 Nov 2019 06:18:37 +0100 Message-Id: <20191119051419.731975303@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 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 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 fa61c870ada94..1d9b8aaea06c8 100644 --- a/arch/x86/kernel/cpu/cyrix.c +++ b/arch/x86/kernel/cpu/cyrix.c @@ -437,7 +437,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