From nobody Mon Feb 9 09:33:30 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1577056909; cv=none; d=zohomail.com; s=zohoarc; b=Oqb17eCwKmjsMJK9DQO0KzST/s0YmTl8Z+SngNynBvoeAsjAwNq9VC9srS97jmCdqNqg+jLPB3thTSKbpVWql3Nm/vMSolQoU7Y7dcFYlHOal2B0491IOTAHmfPh5tXAhKUDzBev8xPYwVCxExjQh6lzf1JYmt+COo6dciV9Zgs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577056909; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fb1uCJzQRjXHXY1tGF0/CbZ1iquuodzjfYJsSE91Gag=; b=FISO3nsROW2VCBbOoO8bhDplmjDKgofSAnvm8nJ0GUj8tRCrHKSUB6h1tsyIa2lqdTjcNOveKoiBdbuWIswqyxGRo9A0YtirUgBOf2T6BVx/DPKPjo3qs/P7MmGv8EKJRpbiEe9zKOET/2CqqvQo7tfTslmnoOXWXlb2+SsVTQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1577056909424191.21618423086443; Sun, 22 Dec 2019 15:21:49 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ijAWw-0004PY-9V; Sun, 22 Dec 2019 23:20:58 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ijAWu-0004P9-Ef for xen-devel@lists.xenproject.org; Sun, 22 Dec 2019 23:20:56 +0000 Received: from mail-wr1-x444.google.com (unknown [2a00:1450:4864:20::444]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id accb77ca-2511-11ea-88e7-bc764e2007e4; Sun, 22 Dec 2019 23:20:43 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id j42so14836332wrj.12 for ; Sun, 22 Dec 2019 15:20:43 -0800 (PST) Received: from debian.mshome.net (38.163.200.146.dyn.plus.net. [146.200.163.38]) by smtp.gmail.com with ESMTPSA id h2sm19925613wrt.45.2019.12.22.15.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Dec 2019 15:20:42 -0800 (PST) X-Inumbo-ID: accb77ca-2511-11ea-88e7-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0FuqPg6OicHWxmxledg/CsU4XQQ9Kjf4XPECo9VYLsw=; b=QI96+amyNQT37ZoWUJTXu9SxcZmtEO8C0BB5cz9YVSJRjocF/surQ899Kh47GRlqWo ffEbzmQmhjikSTnIhkxJGh897MYBI8pPf0tk8+6/Y5OrWt5tcRIIKP//Xy35R1wNWgjp dh+dmelE8ltFdu6sBg4Yb1wdNM6EpP5TdpSufYFUfeUcBtbxc28UT7Zsy4S2Q5PsNQ7f eBoLxbyOJTxhfHSfLTLcyRMamXmlxKVVYGCmEPGCOhBPmcNNsWMeF/Twq9k2YFpWspIL cSLl0EORMx8mz5DiARhXLxCYrC5ELhV43+bbii4jBeDJCAtqc79qmt5Zr0egw/gH0Zq2 QTfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0FuqPg6OicHWxmxledg/CsU4XQQ9Kjf4XPECo9VYLsw=; b=IKcqjQUbk+JLE1g+Ua0CO7GLQe5I6b4vb5s5FdGRjGiprlN2JQ08ZL1JkJuAARvJcx FWjXezGb77IghpD/YdpvTkdmweW4blbMSZwJp++p5eHDnGAQXqDAC3PIwrtran43TNOJ J/8HFbftn1a9VuakMsxmjU6THMNXLirKhBYiEdBzPca5ZN//iY+yXo7DAjuNVuJN3EvX YOh2trMX5tou5YY9p3VnrTPzqqTeqEkIsmGxvIcbpEWHayw7sabAiz1Gb9OyE0chpXw1 jEsqcHJn4Z0IluHFtpMc4Zqb4485EOZILsnp5kv+3TYJXJ+RaPb8drahb01o4ZuXdUIm tf0A== X-Gm-Message-State: APjAAAXldcHzmmh+Whdx5vTJCS/H1imG37vyBOCUGp0MaAKC4c5hvqTE vfcElViw3X0dweAE6BAL0zEJ0HWB X-Google-Smtp-Source: APXvYqyCS04af0H2GZWbuDL2vxFE/0q7xGQuYSaWZU8+iPR3UvXNMq9pKtBhjvR93EyXQ+Dm4s92NQ== X-Received: by 2002:adf:f103:: with SMTP id r3mr26168085wro.295.1577056842635; Sun, 22 Dec 2019 15:20:42 -0800 (PST) From: Wei Liu X-Google-Original-From: Wei Liu To: Xen Development List Date: Sun, 22 Dec 2019 23:20:35 +0000 Message-Id: <20191222232035.31613-4-liuwe@microsoft.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191222232035.31613-1-liuwe@microsoft.com> References: <20191222232035.31613-1-liuwe@microsoft.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 3/3] x86/viridian: drop viridian_stimer_config_msr X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Wei Liu , Wei Liu , Paul Durrant , Andrew Cooper , Paul Durrant , Michael Kelley , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use hv_stimer_config instead. No functional change. Signed-off-by: Wei Liu --- xen/arch/x86/hvm/viridian/time.c | 28 ++++++++++++++-------------- xen/include/asm-x86/hvm/viridian.h | 19 +------------------ 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/time.c b/xen/arch/x86/hvm/viridian/t= ime.c index 0f1cd9e208..3de5665c02 100644 --- a/xen/arch/x86/hvm/viridian/time.c +++ b/xen/arch/x86/hvm/viridian/time.c @@ -220,7 +220,7 @@ static void poll_stimer(struct vcpu *v, unsigned int st= imerx) * is disabled make sure the pending bit is cleared to avoid re- * polling. */ - if ( !vs->config.enabled ) + if ( !vs->config.enable ) { clear_bit(stimerx, &vv->stimer_pending); return; @@ -239,7 +239,7 @@ static void poll_stimer(struct vcpu *v, unsigned int st= imerx) if ( vs->config.periodic ) start_stimer(vs); else - vs->config.enabled =3D 0; + vs->config.enable =3D 0; } =20 void viridian_time_poll_timers(struct vcpu *v) @@ -285,7 +285,7 @@ static void time_vcpu_thaw(struct vcpu *v) { struct viridian_stimer *vs =3D &vv->stimer[i]; =20 - if ( vs->config.enabled ) + if ( vs->config.enable ) start_stimer(vs); } } @@ -355,12 +355,12 @@ int viridian_time_wrmsr(struct vcpu *v, uint32_t idx,= uint64_t val) =20 stop_stimer(vs); =20 - vs->config.raw =3D val; + vs->config.as_uint64 =3D val; =20 if ( !vs->config.sintx ) - vs->config.enabled =3D 0; + vs->config.enable =3D 0; =20 - if ( vs->config.enabled ) + if ( vs->config.enable ) start_stimer(vs); =20 break; @@ -383,11 +383,11 @@ int viridian_time_wrmsr(struct vcpu *v, uint32_t idx,= uint64_t val) vs->count =3D val; =20 if ( !vs->count ) - vs->config.enabled =3D 0; + vs->config.enable =3D 0; else if ( vs->config.auto_enable ) - vs->config.enabled =3D 1; + vs->config.enable =3D 1; =20 - if ( vs->config.enabled ) + if ( vs->config.enable ) start_stimer(vs); =20 break; @@ -454,7 +454,7 @@ int viridian_time_rdmsr(const struct vcpu *v, uint32_t = idx, uint64_t *val) unsigned int stimerx =3D (idx - HV_X64_MSR_STIMER0_CONFIG) / 2; const struct viridian_stimer *vs =3D &array_access_nospec(vv->stimer, stimerx); - union viridian_stimer_config_msr config =3D vs->config; + union hv_stimer_config config =3D vs->config; =20 if ( !(viridian_feature_mask(d) & HVMPV_stimer) ) return X86EMUL_EXCEPTION; @@ -464,9 +464,9 @@ int viridian_time_rdmsr(const struct vcpu *v, uint32_t = idx, uint64_t *val) * the enabled flag is clear. */ if ( !config.periodic && test_bit(stimerx, &vv->stimer_pending) ) - config.enabled =3D 0; + config.enable =3D 0; =20 - *val =3D config.raw; + *val =3D config.as_uint64; break; } =20 @@ -549,7 +549,7 @@ void viridian_time_save_vcpu_ctxt( { const struct viridian_stimer *vs =3D &vv->stimer[i]; =20 - ctxt->stimer_config_msr[i] =3D vs->config.raw; + ctxt->stimer_config_msr[i] =3D vs->config.as_uint64; ctxt->stimer_count_msr[i] =3D vs->count; } } @@ -564,7 +564,7 @@ void viridian_time_load_vcpu_ctxt( { struct viridian_stimer *vs =3D &vv->stimer[i]; =20 - vs->config.raw =3D ctxt->stimer_config_msr[i]; + vs->config.as_uint64 =3D ctxt->stimer_config_msr[i]; vs->count =3D ctxt->stimer_count_msr[i]; } } diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/v= iridian.h index d694d83521..d9138562e6 100644 --- a/xen/include/asm-x86/hvm/viridian.h +++ b/xen/include/asm-x86/hvm/viridian.h @@ -28,27 +28,10 @@ struct viridian_page void *ptr; }; =20 -union viridian_stimer_config_msr -{ - uint64_t raw; - struct - { - uint64_t enabled:1; - uint64_t periodic:1; - uint64_t lazy:1; - uint64_t auto_enable:1; - uint64_t vector:8; - uint64_t direct_mode:1; - uint64_t reserved_zero1:3; - uint64_t sintx:4; - uint64_t reserved_zero2:44; - }; -}; - struct viridian_stimer { struct vcpu *v; struct timer timer; - union viridian_stimer_config_msr config; + union hv_stimer_config config; uint64_t count; uint64_t expiration; bool started; --=20 2.20.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel