Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1548718

[PATCH 10/18] Drivers: hv: vmbus: Restructure the clockevents code

Show all headers | View raw

From: K. Y. Srinivasan <kys@microsoft.com>

Move the relevant code that programs the hypervisor to an architecture
specific file.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/18] Drivers: hv: vmbus: Restructure architecture specific code  kys@exchange.microsoft.com - 2016-12-30 20:40 +0100
  [PATCH 08/18] Drivers: hv: vmbus: Move the check for hypercall page setup kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
  [PATCH 05/18] Drivers: hv: vmbus: Consolidate all Hyper-V specific clocksource code kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
  [PATCH 03/18] Drivers: hv vmbus: Move Hypercall page setup out of common code kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
  [PATCH 02/18] Drivers: hv: vmbus: Move the definition of generate_guest_id() kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
  [PATCH 01/18] Drivers: hv: vmbus: Move the definition of hv_x64_msr_hypercall_contents kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 15/18] Drivers: hv: vmbus: Define APIs to manipulate the synthetic interrupt controller kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 04/18] Drivers: hv: vmbus: Move Hypercall invocation code out of common code kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 09/18] Drivers: hv: vmbus: Move the code to signal end of message kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 18/18] Drivers: hv: vmbus: Cleanup hyperv_vmbus.h kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 14/18] Drivers: hv: vmbus: Define APIs to manipulate the event page kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 06/18] Drivers: hv: vmbus: Move the extracting of Hypervisor version information kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 10/18] Drivers: hv: vmbus: Restructure the clockevents code kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 17/18] Drivers: hv: vmbus: Define an APIs to manage interrupt state kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 11/18] Drivers: hv: util: Use hv_get_current_tick() to get current tick kys@exchange.microsoft.com - 2016-12-30 20:50 +0100
    [PATCH 12/18] Drivers: hv: vmbus: Get rid of an unsused variable kys@exchange.microsoft.com - 2016-12-30 21:00 +0100
    [PATCH 13/18] Drivers: hv: vmbus: Define APIs to manipulate the message page kys@exchange.microsoft.com - 2016-12-30 21:00 +0100
    [PATCH 07/18] Drivers: hv: vmbus: Move the crash notification function kys@exchange.microsoft.com - 2016-12-30 21:00 +0100

csiph-web