Received: by 2002:a05:7412:ba23:b0:fa:4c10:6cad with SMTP id jp35csp740212rdb; Thu, 18 Jan 2024 18:52:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9rO4gZvL6k1i3mx5e6srXKtqiKuPEV4X9Tpk/jB798Yg8ZBvPnFv3rix69XC4dHm+uNUW X-Received: by 2002:a05:620a:284d:b0:783:48b1:7b71 with SMTP id h13-20020a05620a284d00b0078348b17b71mr783947qkp.9.1705632755551; Thu, 18 Jan 2024 18:52:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705632755; cv=pass; d=google.com; s=arc-20160816; b=so3MOnb8LJLJhUggJc/1f0V97cUO5vBqS+edszm1KkAD8RY3DMmAr2InvCp0ui+s6d HrStHD1+NS+XlX9iLyQ5ly1Xlmv9OS0bOJ0ZvBvojIZuVuS9jqtLT+XSgyv5fCfZmAH5 itypdMcHDbiYUKWqFn8EQih3vbvJ1R5OSq8TPnrMFvvo2dIiOxf8tu1kSkcSMkX4VJva sdvcxVaUlk5gGAPYqZecjOC8nPdRuFMzTI0jvz1YZuR+BoIf5KX6Pf3T2FCsxDa432cU Sr5FSnsIZM6EX96/FljSHNTzAdjERAJsaCMwrrc79AGivxxoOgZuFpFOam22zEFAZagu v3TA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-disposition:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:subject:cc:to:from:date :dkim-signature; bh=L5iqBmuqE2YxEh+GaohLeMw4Xi7NkOuYh32128g3HC8=; fh=DkukUrS+kCZe0PRCamXxo9ynZPHE61SzeD6yz4nzfVU=; b=S2Pc3OJfkTjx/cVsZHiCae90RupE4VXVQYb9GMkX18aQVeACT5aQW+WsPalXZpVocA WSl+lKf8tOT78ehuWa9NrSXYXd24B23PXgnxkaNv/UKu4Dn9kuFcUZq6Ok135JBBIjDI 4e7Org+An8wNaZ3ra6Y3ENPZFLrOpwUvQC30RiT9wKEggxwFMOGjqJpJjGqL3OL123Fj +qn07fqo7WRbdDTc26IQf0LjLTU1xOxQS/TOyfakfeY6ZRk+est+8VC6z8aH0Jpt6MgK 5uuqKiOkLhAWqu/p4eHb0rL8oLETFEL6KrJOTzuMrYia7bGThyf+ywNGavRDQCjtUssX sGeQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bwy9SS3Z; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-30716-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-30716-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id ow21-20020a05620a821500b0078328bda904si14784918qkn.499.2024.01.18.18.52.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 18:52:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-30716-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=bwy9SS3Z; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-30716-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-30716-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 152691C222DE for ; Fri, 19 Jan 2024 02:52:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 39019186F; Fri, 19 Jan 2024 02:52:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="bwy9SS3Z" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E292E15A4 for ; Fri, 19 Jan 2024 02:52:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705632748; cv=none; b=sb+f3n4U8RbePqCtxBerVBsUgj8i/j6AmWCbMRajXwlXX05YqTTz4rL/fr0YEY69/LdPLZmZDnMomDRR2DQ85Vwhp51ZEjr0FRtt6y27lopktfEN3PYTiSTSxH1e5IheHbOTWMA5SQ01KJY/2Q5L8d1sVLLHOgcrer+J4ELWAds= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705632748; c=relaxed/simple; bh=6S2qjNkz/Jifeoy79y+6wsAJfFEcpfQEqDGnMvPzCKM=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=WBha/m/eknn74yRzBEmu/lPTli4lptUvf+INpZ7+Mtem8/aTM62Yy2zYawf3I1A8l56ghl++XUjXR4S8090Rs0mzAKm5yK9ipftwPhDXntcmsyVqYyLw6YwdO7y+w22tGfF3K2JIXo+y/Zz8puuHOTuEniJScbWPTk4T35atNtc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=bwy9SS3Z; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705632747; x=1737168747; h=date:from:to:cc:subject:message-id:mime-version; bh=6S2qjNkz/Jifeoy79y+6wsAJfFEcpfQEqDGnMvPzCKM=; b=bwy9SS3ZtH4lb/nWVNFDWJ5YHu/fvRyhETpzh7NLl/55xaL7aZUjg4VT GUvq+4VzIx8fsqyxciVIf2nzYUb8waOLRnqN10OZy3dA1yaAVAnShT4zo U3Xf5x6m7cHM3p4MGXmUBxMbaV0AJpaHsbi5ilB9rdwcj5er2qZ4lTKhb 7NGLl+S4zQrcFth0uFLPLfP+SznebzSWaOxk+g4XuwIvgqsZu0j+It5Cn M5ZdpHDP+ARA8uTDwa2HeTbKKOuc3S4Nt6D5nzyDzttJ5QcXOfT2r2kYo 4Uzuyh1YHNXjGafQ4HpBNljLdZe5aDTKvalDKsqXnao0b8IGBbCWWQGgJ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10956"; a="537384" X-IronPort-AV: E=Sophos;i="6.05,203,1701158400"; d="scan'208";a="537384" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2024 18:52:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10956"; a="761019511" X-IronPort-AV: E=Sophos;i="6.05,203,1701158400"; d="scan'208";a="761019511" Received: from pialybar-mobl2.amr.corp.intel.com (HELO desk) ([10.209.49.165]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jan 2024 18:52:25 -0800 Date: Thu, 18 Jan 2024 18:52:24 -0800 From: Pawan Gupta To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: linux-kernel@vger.kernel.org, daniel.sneddon@linux.intel.com, antonio.gomez.iglesias@linux.intel.com Subject: [PATCH] x86/msr-index: Fix the order of ARCH_CAP_XAPIC_DISABLE bit Message-ID: <243317ff6c8db307b7701a45f71e5c21da80194b.1705632532.git.pawan.kumar.gupta@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline XAPIC_DISABLE bit of MSR_IA32_ARCH_CAP is not in correct order, fix it. No functional change. Signed-off-by: Pawan Gupta --- arch/x86/include/asm/msr-index.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 1d51e1850ed0..c72d68fc774f 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -152,6 +152,10 @@ * are restricted to targets in * kernel. */ +#define ARCH_CAP_XAPIC_DISABLE BIT(21) /* + * IA32_XAPIC_DISABLE_STATUS MSR + * supported + */ #define ARCH_CAP_PBRSB_NO BIT(24) /* * Not susceptible to Post-Barrier * Return Stack Buffer Predictions. @@ -166,11 +170,6 @@ * Data Sampling (GDS). */ -#define ARCH_CAP_XAPIC_DISABLE BIT(21) /* - * IA32_XAPIC_DISABLE_STATUS MSR - * supported - */ - #define MSR_IA32_FLUSH_CMD 0x0000010b #define L1D_FLUSH BIT(0) /* * Writeback and invalidate the base-commit: 0dd3ee31125508cd67f7e7172247f05b7fd1753a -- 2.34.1