From patchwork Fri Dec 20 19:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 11306261 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 44A1014B7 for ; Fri, 20 Dec 2019 19:53:10 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 203702072B for ; Fri, 20 Dec 2019 19:53:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WvrmGTxk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 203702072B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iiOJT-0005EA-Pm; Fri, 20 Dec 2019 19:51:51 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iiOJS-0005Dp-CO for xen-devel@lists.xenproject.org; Fri, 20 Dec 2019 19:51:50 +0000 X-Inumbo-ID: 24652dbe-2362-11ea-88e7-bc764e2007e4 Received: from mail-wr1-x442.google.com (unknown [2a00:1450:4864:20::442]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 24652dbe-2362-11ea-88e7-bc764e2007e4; Fri, 20 Dec 2019 19:51:41 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id d16so10505399wre.10 for ; Fri, 20 Dec 2019 11:51:41 -0800 (PST) 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=p63vANUUHWEiaTG5fEa7etsoj01L2p/h59chGd1If3w=; b=WvrmGTxkUZLbvsTmPoOjsQ7aNTFj99Yc9qsu72SmuE37wjzSsP0dk356wAc2carLgV 2CtbtZcLOVRMAbWfVOoNqVTqvkM6v1rNufVdpzoIZ1V2DA8pK4AqMXSZbm1KNQ2IGszd DY3cO3VFvDjlbsY7eUx3cVGMpN8QUtV0PRYPlflgqtpG2kyb7iH+bp34lIZgHZn7GSD6 BtwIRuZGZYNmWOS8TURS1AwJYR5Fgz5vqL4TvBr9klYWtjl0plltBY0WI8Ylt9kSn4BW hBARswRsPkkoym/5v4VDtdAm9DNR7M/FE4PWKH0VcJRnAh6YPuVq8ov326G/MXzHSexE Y1uQ== 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=p63vANUUHWEiaTG5fEa7etsoj01L2p/h59chGd1If3w=; b=a7xaM49prkBlbfpdz78uagYySITv/M1LO/uYygGTY2hF4zCmkRuw34dw4HatgcROQB VsraYmeziJFdfvlHch5KlJgL9AmgSb6PQqifk+oDA6pLQNoY6BOeDqXCa6nCn9NTUy7V 6C30cSOfk7vQGFCcJBeFJpOcaVv2XOaprMA/nH88q7kha+ka2oCY3fqAH7Sk5JcYxbsB qrQOal6du6t8iAQx+j1tUk/saTYG/utdP1IbBpg5CZU9CSMqiq4NJ+DPC3RQ2HkZtc4y 6U0mx3hi+2WtTA8sGSXormWFwcX5jZh4TQOmBreH0+uq20d531e4mR4w+s1q1RaecyTg Nzaw== X-Gm-Message-State: APjAAAUOmJ6+UNl8JbFsHKP2Afcl0aQMSw2cIgGTfleNU1GnIAY7aJbT 7fDYYP1YGaY9m66WKhXQ4wLAPxGW X-Google-Smtp-Source: APXvYqw2prC6ibEdVfsX3UNHDe+TFEYmtnkAVF+mTWOBh8bEfgvQDlNCrkm3OKy+E4BolihQtcuA5g== X-Received: by 2002:a05:6000:1142:: with SMTP id d2mr15998129wrx.253.1576871500770; Fri, 20 Dec 2019 11:51:40 -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 a184sm11006287wmf.29.2019.12.20.11.51.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 11:51:40 -0800 (PST) From: Wei Liu X-Google-Original-From: Wei Liu To: Xen Development List Date: Fri, 20 Dec 2019 19:51:33 +0000 Message-Id: <20191220195135.20130-3-liuwe@microsoft.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191220195135.20130-1-liuwe@microsoft.com> References: <20191220195135.20130-1-liuwe@microsoft.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 2/4] x86/viridian: drop private copy of HV_REFERENCE_TSC_PAGE in time.c 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_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Use the one defined in hyperv-tlfs.h instead. No functional change intended. Signed-off-by: Wei Liu Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian/time.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/time.c b/xen/arch/x86/hvm/viridian/time.c index 6ddca29b29..32e79bbcc4 100644 --- a/xen/arch/x86/hvm/viridian/time.c +++ b/xen/arch/x86/hvm/viridian/time.c @@ -13,19 +13,11 @@ #include #include +#include #include #include "private.h" -typedef struct _HV_REFERENCE_TSC_PAGE -{ - uint32_t TscSequence; - uint32_t Reserved1; - uint64_t TscScale; - int64_t TscOffset; - uint64_t Reserved2[509]; -} HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE; - static void update_reference_tsc(const struct domain *d, bool initialize) { struct viridian_domain *vd = d->arch.hvm.viridian; @@ -61,7 +53,7 @@ static void update_reference_tsc(const struct domain *d, bool initialize) * violate the spec. and rely on a value of 0 to indicate that this * enlightenment should no longer be used. */ - p->TscSequence = 0; + p->tsc_sequence = 0; printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: invalidated\n", d->domain_id); @@ -79,15 +71,15 @@ static void update_reference_tsc(const struct domain *d, bool initialize) * The offset value is calculated on restore after migration and * ensures that Windows will not see a large jump in ReferenceTime. */ - p->TscScale = ((10000ul << 32) / d->arch.tsc_khz) << 32; - p->TscOffset = trc->off; + p->tsc_scale = ((10000ul << 32) / d->arch.tsc_khz) << 32; + p->tsc_offset = trc->off; smp_wmb(); - seq = p->TscSequence + 1; + seq = p->tsc_sequence + 1; if ( seq == 0xFFFFFFFF || seq == 0 ) /* Avoid both 'invalid' values */ seq = 1; - p->TscSequence = seq; + p->tsc_sequence = seq; } /*