Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1052018ybp; Thu, 17 Oct 2019 07:23:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqzflKtaCboV+5kBvTvNeWgIHdu1BOtg+yHJ3bTaSVBZy/FiNCgXFpCykD6kBiJTSEWDb4Gm X-Received: by 2002:a17:906:6011:: with SMTP id o17mr3627772ejj.172.1571322181564; Thu, 17 Oct 2019 07:23:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571322181; cv=none; d=google.com; s=arc-20160816; b=Y47TtoFxuPnUzXeZkut9vlRzEZRvOsV27tV3Idwr6zvz/roFLvyPI3sa/HvZFTYqE1 93B4sINvCPAqOk6KCqcb9fo6Tmij10ej9tHJuIztmJwR+VxLsQ0yFdcR+f3jhnZIGiyd 1MXYzZisY88/t6tAupTGBfnP04I7LwM54g3/ITKX700NGUp2767AMjOWOVFz5nhOvvXu rzTaiBjCv8BXHzT3hAChSug4P+SWh+W9hqrIhW9DKQ8PialdcGw9jI0uvWls6f1P5qfG pvGa9zOM32DaV+ujSd8jfmgLug4uQf5YPpt9U+eBjbYIgokhhvcJcTlTWkIbzuyBzwE9 t/0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ixU8b/7VcsrYZaL4rLUSG2BbxcF5wZ6k1foLpQ720EI=; b=QABLzr5eK1z/oVqN977JZsWqEMPFogzf/Yp5XEQbJkIQL0hsgt/vlTYBTRLPX99Edl vlN5VOe3Yk2xTQE2TrB0qZNdnX5HZvWW4GUl3LOqB0G4oaYHx7fvB6YlNkiV9e+GnNvc CFDsTLKOXyIJT227CsLrhyXSYU8QX41WXcbG9M4EVOmK7szc6FZfSyPJoo78HHsEIr3A F00K7nCD3E42A5v1TmOMON8F1diRK1xrmNcB5Xj8wsItOzmtHcd6LoniZnMhc24B0rwj +g574zuB82bPzBGh96Eg3kjLg6e4Vphza+XEGftIZ8xGI4eMlpBCrqY6WROniU/rl5pG p9rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0TI8Zi2J; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x25si1700555edd.350.2019.10.17.07.22.39; Thu, 17 Oct 2019 07:23:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0TI8Zi2J; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395279AbfJPVzi (ORCPT + 99 others); Wed, 16 Oct 2019 17:55:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:46310 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395244AbfJPVzc (ORCPT ); Wed, 16 Oct 2019 17:55:32 -0400 Received: from localhost (unknown [192.55.54.58]) (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 AE951218DE; Wed, 16 Oct 2019 21:55:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262931; bh=bqQD1JbQd7t0d/KBSwKHC0ES/WEKFwKh6Yj1/Q/t9aI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0TI8Zi2JhBlk7LlNeTzFIi84UOMEmAdjB428qEKN20wIBjyeJpnAJ23RNI7f1WTUV 0W3yKiqdc0YjQDi0AFz4gjS1Wx9kFz4uHt2NuE1kj8OpDFs+9LKkls3J5NdG6ke+PG gixUXh5LGW9dua7BPnCBvUreLiEsbP2ieXjAKdZM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Janakarajan Natarajan , Borislav Petkov , Frederic Weisbecker , "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , "x86@kernel.org" , Zhenzhong Duan , Ingo Molnar Subject: [PATCH 4.9 91/92] x86/asm: Fix MWAITX C-state hint value Date: Wed, 16 Oct 2019 14:51:04 -0700 Message-Id: <20191016214848.802788649@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@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: Janakarajan Natarajan commit 454de1e7d970d6bc567686052329e4814842867c upstream. As per "AMD64 Architecture Programmer's Manual Volume 3: General-Purpose and System Instructions", MWAITX EAX[7:4]+1 specifies the optional hint of the optimized C-state. For C0 state, EAX[7:4] should be set to 0xf. Currently, a value of 0xf is set for EAX[3:0] instead of EAX[7:4]. Fix this by changing MWAITX_DISABLE_CSTATES from 0xf to 0xf0. This hasn't had any implications so far because setting reserved bits in EAX is simply ignored by the CPU. [ bp: Fixup comment in delay_mwaitx() and massage. ] Signed-off-by: Janakarajan Natarajan Signed-off-by: Borislav Petkov Cc: Frederic Weisbecker Cc: Greg Kroah-Hartman Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "x86@kernel.org" Cc: Zhenzhong Duan Cc: Link: https://lkml.kernel.org/r/20191007190011.4859-1-Janakarajan.Natarajan@amd.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/mwait.h | 2 +- arch/x86/lib/delay.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- a/arch/x86/include/asm/mwait.h +++ b/arch/x86/include/asm/mwait.h @@ -19,7 +19,7 @@ #define MWAIT_ECX_INTERRUPT_BREAK 0x1 #define MWAITX_ECX_TIMER_ENABLE BIT(1) #define MWAITX_MAX_LOOPS ((u32)-1) -#define MWAITX_DISABLE_CSTATES 0xf +#define MWAITX_DISABLE_CSTATES 0xf0 static inline void __monitor(const void *eax, unsigned long ecx, unsigned long edx) --- a/arch/x86/lib/delay.c +++ b/arch/x86/lib/delay.c @@ -112,8 +112,8 @@ static void delay_mwaitx(unsigned long _ __monitorx(raw_cpu_ptr(&cpu_tss), 0, 0); /* - * AMD, like Intel, supports the EAX hint and EAX=0xf - * means, do not enter any deep C-state and we use it + * AMD, like Intel's MWAIT version, supports the EAX hint and + * EAX=0xf0 means, do not enter any deep C-state and we use it * here in delay() to minimize wakeup latency. */ __mwaitx(MWAITX_DISABLE_CSTATES, delay, MWAITX_ECX_TIMER_ENABLE);