From nobody Sun May 5 16:54:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1609356988; cv=none; d=zohomail.com; s=zohoarc; b=YiUDbkM+hlVJbVeZ9e5S51X4Rub8C3PPA94gZ1HSAKgBwZuefIs9qtSOJA0t2OVPtP8kFioeW5ub1xl8Q6k5gk35cZq8RB7VBWpUoW2sCaOlJWJAdiRcYAReBItTTFNSpILeukscEaRJ9RNjz4S90oGpnZgCpISYrnWBhHqXpxI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609356988; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=X80Hvz/LoSTyhL5/9Objg3Qjhw/8wkpTnOmBwcVvepQ=; b=IjnOtjG+JT9ZhqmZL0ctlYOa6FTvA2QiBNLmcGbPFkGg5+82yxUbj11p/joQMI8aq9P3GouaERZPDiapIeODijhZPhK16Ib0PEkIB7UIqKtrg9XHuoSixXccU0CteQ3nJ0uTT46vv5YZJLDAzm0j/S0xK9lRo6PudZvFL1WHzzg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1609356988941866.7814262833075; Wed, 30 Dec 2020 11:36:28 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.60245.105617 (Exim 4.92) (envelope-from ) id 1kuhGG-0003mV-Nw; Wed, 30 Dec 2020 19:35:56 +0000 Received: by outflank-mailman (output) from mailman id 60245.105617; Wed, 30 Dec 2020 19:35:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kuhGG-0003mO-L6; Wed, 30 Dec 2020 19:35:56 +0000 Received: by outflank-mailman (input) for mailman id 60245; Wed, 30 Dec 2020 19:35:55 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kuhGF-0003mJ-5b for xen-devel@lists.xenproject.org; Wed, 30 Dec 2020 19:35:55 +0000 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e0c166cc-5119-43c1-9d9b-53adb90db94d; Wed, 30 Dec 2020 19:35:53 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e0c166cc-5119-43c1-9d9b-53adb90db94d DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1609356953; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=aVkhF2nw9dU6WVxFGut4OlYQbrrCDmVSzhxlhz6QfRA=; b=bA3ngfEtBx77W/w9dKM4QQPEjoHVaAe4KQD9HxGR/HdJucaTHmded/3k 4gJXjKOBqePDHm21qbg6YhMtfLkls8a44sXYghtLW/J35kHRzsbZGFGA1 tbmyn14dQ2uWh43zQR0gdBXKUgfVlV99dn2U9o+Tj1A2mvJah+Sol/+lq 0=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: mYKhCpP1c5YOjRU5DGgtJMG8PaD52xHH5JLEAaVMJUNXaDg1af3EuF9o1s6+xkYghEgHTZv3FY PMq9lYWVQC3gSUwLIOpGDlXimb1wuPuWomdWDrAMDEvglP+9sS6tdGI3U1XniI/iN8uqVxhqFd 8j0yc0DvoZuwcq3KGqm110e3B5JE/wFmC4DoiYtYE83T6m1gwPilG3Wq6pgG55//rGYpKa/Qa7 pcSgluZsLz8RfQacz20MT1vUhNdky/ULQ2bs2Mdfnu6wgBukCm2/poX89s6f6pALN4A+nWdlg1 fxU= X-SBRS: 5.2 X-MesageID: 34532738 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.78,462,1599537600"; d="scan'208";a="34532738" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [PATCH] x86/svm: Clean up MSR_K8_VM_CR definitions Date: Wed, 30 Dec 2020 19:35:25 +0000 Message-ID: <20201230193525.12290-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) Drop the unused shift number, and reposition the constants into the cleaned= -up section. Rename VM_CR_SVM_DISABLE to be closer to its APM definition. Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monn=C3=A9 --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu This is cleanup to help a forthcoming Trenchboot change, which will use more bits in the MSR. --- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/include/asm-x86/msr-index.h | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 0854fcfc14..b819897a4a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1586,7 +1586,7 @@ static int _svm_cpu_up(bool bsp) =20 /* Check whether SVM feature is disabled in BIOS */ rdmsrl(MSR_K8_VM_CR, msr_content); - if ( msr_content & K8_VMCR_SVME_DISABLE ) + if ( msr_content & VM_CR_SVM_DISABLE ) { printk("CPU%d: AMD SVM Extension is disabled in BIOS.\n", cpu); return -EINVAL; diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-inde= x.h index 3e0c6c8476..ff583cf0ed 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -116,6 +116,9 @@ #define PASID_PASID_MASK 0x000fffff #define PASID_VALID (_AC(1, ULL) << 31) =20 +#define MSR_K8_VM_CR 0xc0010114 +#define VM_CR_SVM_DISABLE (_AC(1, ULL) << 4) + /* * Legacy MSR constants in need of cleanup. No new MSRs below this commen= t. */ @@ -297,7 +300,6 @@ #define MSR_K8_PSTATE6 0xc001006A #define MSR_K8_PSTATE7 0xc001006B #define MSR_K8_ENABLE_C1E 0xc0010055 -#define MSR_K8_VM_CR 0xc0010114 #define MSR_K8_VM_HSAVE_PA 0xc0010117 =20 #define MSR_AMD_FAM15H_EVNTSEL0 0xc0010200 @@ -318,10 +320,6 @@ #define MSR_K8_FEATURE_MASK 0xc0011004 #define MSR_K8_EXT_FEATURE_MASK 0xc0011005 =20 -/* MSR_K8_VM_CR bits: */ -#define _K8_VMCR_SVME_DISABLE 4 -#define K8_VMCR_SVME_DISABLE (1 << _K8_VMCR_SVME_DISABLE) - /* AMD64 MSRs */ #define MSR_AMD64_NB_CFG 0xc001001f #define AMD64_NB_CFG_CF8_EXT_ENABLE_BIT 46 --=20 2.11.0