Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754621AbcL3Tkd (ORCPT ); Fri, 30 Dec 2016 14:40:33 -0500 Received: from p3plsmtps2ded04.prod.phx3.secureserver.net ([208.109.80.198]:46818 "EHLO p3plsmtps2ded04.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754136AbcL3Tjd (ORCPT ); Fri, 30 Dec 2016 14:39:33 -0500 x-originating-ip: 72.167.245.219 From: kys@exchange.microsoft.com To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com, leann.ogasawara@canonical.com, rkagan@virtuozzo.com, x86@kernel.org, tglx@linutronix.de, hpa@zytor.com Cc: "K. Y. Srinivasan" Subject: [PATCH 10/18] Drivers: hv: vmbus: Restructure the clockevents code Date: Fri, 30 Dec 2016 13:36:04 -0800 Message-Id: <1483133772-29776-10-git-send-email-kys@exchange.microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1483133772-29776-1-git-send-email-kys@exchange.microsoft.com> References: <1483133701-29738-1-git-send-email-kys@exchange.microsoft.com> <1483133772-29776-1-git-send-email-kys@exchange.microsoft.com> Reply-To: kys@microsoft.com X-CMAE-Envelope: MS4wfFT637zA+QjApDPItGYzlty9IZmF2gsS0ZMFNebbl+RhvRdPyCEPAlOSAzU9YreJf5c5fNUsMGQAxcZJoFBc99HsOAXSZtbIWUshJbktSf97ICloa+jY sSzlS5jEvcWGrVrFMH/eYc4JUfUcsZZkQita3Ey5USEGF8EdKrZucuyR/2VFl0n8Kl0x5o7L93aQy3QWLeH8LuN0LmKEoOK9IepisWF82VQ9SZtHy9S62Q8c kSitl9jwFEv7kqGrLO3VsdhLyYnxl83EkGpNbo0qIpmIUIvPWFCTIMOQha7Q7iQToXD+JiFhpISGlZHl81V/QByH+YfGEV90Ju2Pbjee9I9TF3cXgwCMK2XZ jv7jz4sYY3/RzmAXc+/zIDxiR0V1+wd59lNrQTjiUU5qzRNqleQKEu951TzapQcfGhJB1Cu93RS3Gr9H/Vz5ulWUDx4POW2EkXyaVcOFAUTECL9QPvzCBjbx gjcS1rKwoeEbIsQ/GXPWjYOWsfm5TAPPUE+uIBWCpVfaHsoZIbJKj3Jf/S6exEWlh0n2ssMacDCIJhtjgmFz949ibbHYUiH/eGeuqg== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2014 Lines: 62 From: K. Y. Srinivasan Move the relevant code that programs the hypervisor to an architecture specific file. Signed-off-by: K. Y. Srinivasan --- arch/x86/include/asm/mshyperv.h | 4 ++++ drivers/hv/hv.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index b57b470..a58c201 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -136,6 +136,10 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type) } } +#define hv_get_current_tick(tick) rdmsrl(HV_X64_MSR_TIME_REF_COUNT, tick) +#define hv_init_timer(timer, tick) wrmsrl(timer, tick) +#define hv_init_timer_config(config, val) wrmsrl(config, val) + void hyperv_callback_vector(void); #ifdef CONFIG_TRACING #define trace_hyperv_callback_vector hyperv_callback_vector diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 9021398..0afffd8 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -118,16 +118,16 @@ static int hv_ce_set_next_event(unsigned long delta, WARN_ON(!clockevent_state_oneshot(evt)); - rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick); + hv_get_current_tick(current_tick); current_tick += delta; - wrmsrl(HV_X64_MSR_STIMER0_COUNT, current_tick); + hv_init_timer(HV_X64_MSR_STIMER0_COUNT, current_tick); return 0; } static int hv_ce_shutdown(struct clock_event_device *evt) { - wrmsrl(HV_X64_MSR_STIMER0_COUNT, 0); - wrmsrl(HV_X64_MSR_STIMER0_CONFIG, 0); + hv_init_timer(HV_X64_MSR_STIMER0_COUNT, 0); + hv_init_timer_config(HV_X64_MSR_STIMER0_CONFIG, 0); return 0; } @@ -139,7 +139,7 @@ static int hv_ce_set_oneshot(struct clock_event_device *evt) timer_cfg.enable = 1; timer_cfg.auto_enable = 1; timer_cfg.sintx = VMBUS_MESSAGE_SINT; - wrmsrl(HV_X64_MSR_STIMER0_CONFIG, timer_cfg.as_uint64); + hv_init_timer_config(HV_X64_MSR_STIMER0_CONFIG, timer_cfg.as_uint64); return 0; } -- 1.7.4.1