Re: [PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
On Wed, Sep 07, 2011 at 03:25:10PM -0700, K. Y. Srinivasan wrote: The Hyper-V timesource driver is best integrated with Hyper-V detection code since: (a) Linux guests running on Hyper-V need this timesource and (b) by integrating with Hyper-V detection, we could significantly minimize the code in the timesource driver. Signed-off-by: K. Y. Srinivasan k...@microsoft.com Signed-off-by: Haiyang Zhang haiya...@microsoft.com Acked-by: Greg Kroah-Hartman gre...@suse.de ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/virtualization
[PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
The Hyper-V timesource driver is best integrated with Hyper-V detection code
since: (a) Linux guests running on Hyper-V need this timesource and (b)
by integrating with Hyper-V detection, we could significantly minimize the
code in the timesource driver.
Signed-off-by: K. Y. Srinivasan k...@microsoft.com
Signed-off-by: Haiyang Zhang haiya...@microsoft.com
---
arch/x86/kernel/cpu/mshyperv.c | 24 +
drivers/staging/hv/Makefile|2 +-
drivers/staging/hv/hv_timesource.c | 101
3 files changed, 25 insertions(+), 102 deletions(-)
delete mode 100644 drivers/staging/hv/hv_timesource.c
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index d944bf6..c97f88d 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -11,6 +11,8 @@
*/
#include linux/types.h
+#include linux/time.h
+#include linux/clocksource.h
#include linux/module.h
#include asm/processor.h
#include asm/hypervisor.h
@@ -36,6 +38,25 @@ static bool __init ms_hyperv_platform(void)
!memcmp(Microsoft Hv, hyp_signature, 12);
}
+static cycle_t read_hv_clock(struct clocksource *arg)
+{
+ cycle_t current_tick;
+ /*
+* Read the partition counter to get the current tick count. This count
+* is set to 0 when the partition is created and is incremented in
+* 100 nanosecond units.
+*/
+ rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
+ return current_tick;
+}
+
+static struct clocksource hyperv_cs = {
+ .name = hyperv_clocksource,
+ .rating = 400, /* use this when running on Hyperv*/
+ .read = read_hv_clock,
+ .mask = CLOCKSOURCE_MASK(64),
+};
+
static void __init ms_hyperv_init_platform(void)
{
/*
@@ -46,6 +67,9 @@ static void __init ms_hyperv_init_platform(void)
printk(KERN_INFO HyperV: features 0x%x, hints 0x%x\n,
ms_hyperv.features, ms_hyperv.hints);
+
+
+ clocksource_register_hz(hyperv_cs, NSEC_PER_SEC/100);
}
const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index bd176b1..3e0d7e6 100644
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_HYPERV) += hv_vmbus.o hv_timesource.o
+obj-$(CONFIG_HYPERV) += hv_vmbus.o
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
diff --git a/drivers/staging/hv/hv_timesource.c
b/drivers/staging/hv/hv_timesource.c
deleted file mode 100644
index 2b0f9aa..000
--- a/drivers/staging/hv/hv_timesource.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * A clocksource for Linux running on HyperV.
- *
- *
- * Copyright (C) 2010, Novell, Inc.
- * Author : K. Y. Srinivasan ksriniva...@novell.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#define pr_fmt(fmt) KBUILD_MODNAME : fmt
-
-#include linux/clocksource.h
-#include linux/init.h
-#include linux/module.h
-#include linux/pci.h
-#include linux/dmi.h
-#include asm/hyperv.h
-#include asm/mshyperv.h
-#include asm/hypervisor.h
-
-#define HV_CLOCK_SHIFT 22
-
-static cycle_t read_hv_clock(struct clocksource *arg)
-{
- cycle_t current_tick;
- /*
-* Read the partition counter to get the current tick count. This count
-* is set to 0 when the partition is created and is incremented in
-* 100 nanosecond units.
-*/
- rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
- return current_tick;
-}
-
-static struct clocksource hyperv_cs = {
- .name = hyperv_clocksource,
- .rating = 400, /* use this when running on Hyperv*/
- .read = read_hv_clock,
- .mask = CLOCKSOURCE_MASK(64),
- /*
-* The time ref counter in HyperV is in 100ns units.
-* The definition of mult is:
-* mult/2^shift = ns/cyc = 100
-* mult = (100 shift)
-*/
- .mult = (100 HV_CLOCK_SHIFT),
- .shift = HV_CLOCK_SHIFT,
-};
-
-static const struct dmi_system_id __initconst
-hv_timesource_dmi_table[] __maybe_unused = {
- {
- .ident = Hyper-V,
-
Re: [PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
On Tue, 2 Aug 2011, K. Y. Srinivasan wrote:
The Hyper-V timesource driver is best integrated with Hyper-V detection code
since: (a) Linux guests running on Hyper-V need this timesource and (b)
by integrating with Hyper-V detection, we could significantly minimize the
code in the timesource driver.
Andrew, could you take this patch for the -mm tree. I have sent this patch
out multiple times and I have not recived any response or comments.
Signed-off-by: K. Y. Srinivasan k...@microsoft.com
Signed-off-by: Haiyang Zhang haiya...@microsoft.com
Acked-by: Thomas Gleixner t...@linutronix.de
---
arch/x86/kernel/cpu/mshyperv.c | 24
drivers/staging/hv/Makefile|2 +-
drivers/staging/hv/hv_timesource.c | 102
3 files changed, 25 insertions(+), 103 deletions(-)
delete mode 100644 drivers/staging/hv/hv_timesource.c
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index d944bf6..c97f88d 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -11,6 +11,8 @@
*/
#include linux/types.h
+#include linux/time.h
+#include linux/clocksource.h
#include linux/module.h
#include asm/processor.h
#include asm/hypervisor.h
@@ -36,6 +38,25 @@ static bool __init ms_hyperv_platform(void)
!memcmp(Microsoft Hv, hyp_signature, 12);
}
+static cycle_t read_hv_clock(struct clocksource *arg)
+{
+ cycle_t current_tick;
+ /*
+ * Read the partition counter to get the current tick count. This count
+ * is set to 0 when the partition is created and is incremented in
+ * 100 nanosecond units.
+ */
+ rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
+ return current_tick;
+}
+
+static struct clocksource hyperv_cs = {
+ .name = hyperv_clocksource,
+ .rating = 400, /* use this when running on Hyperv*/
+ .read = read_hv_clock,
+ .mask = CLOCKSOURCE_MASK(64),
+};
+
static void __init ms_hyperv_init_platform(void)
{
/*
@@ -46,6 +67,9 @@ static void __init ms_hyperv_init_platform(void)
printk(KERN_INFO HyperV: features 0x%x, hints 0x%x\n,
ms_hyperv.features, ms_hyperv.hints);
+
+
+ clocksource_register_hz(hyperv_cs, NSEC_PER_SEC/100);
}
const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index bd176b1..3e0d7e6 100644
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_HYPERV) += hv_vmbus.o hv_timesource.o
+obj-$(CONFIG_HYPERV) += hv_vmbus.o
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
diff --git a/drivers/staging/hv/hv_timesource.c
b/drivers/staging/hv/hv_timesource.c
deleted file mode 100644
index 0efb049..000
--- a/drivers/staging/hv/hv_timesource.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * A clocksource for Linux running on HyperV.
- *
- *
- * Copyright (C) 2010, Novell, Inc.
- * Author : K. Y. Srinivasan ksriniva...@novell.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#define pr_fmt(fmt) KBUILD_MODNAME : fmt
-
-#include linux/version.h
-#include linux/clocksource.h
-#include linux/init.h
-#include linux/module.h
-#include linux/pci.h
-#include linux/dmi.h
-#include asm/hyperv.h
-#include asm/mshyperv.h
-#include asm/hypervisor.h
-
-#define HV_CLOCK_SHIFT 22
-
-static cycle_t read_hv_clock(struct clocksource *arg)
-{
- cycle_t current_tick;
- /*
- * Read the partition counter to get the current tick count. This count
- * is set to 0 when the partition is created and is incremented in
- * 100 nanosecond units.
- */
- rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
- return current_tick;
-}
-
-static struct clocksource hyperv_cs = {
- .name = hyperv_clocksource,
- .rating = 400, /* use this when running on Hyperv*/
- .read = read_hv_clock,
- .mask = CLOCKSOURCE_MASK(64),
- /*
- * The time ref counter in HyperV is in 100ns units.
- * The
RE: [PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
-Original Message- From: Thomas Gleixner [mailto:t...@linutronix.de] Sent: Friday, September 02, 2011 4:14 AM To: KY Srinivasan Cc: gre...@suse.de; linux-ker...@vger.kernel.org; de...@linuxdriverproject.org; virtualizat...@lists.osdl.org; a...@firstfloor.org; a...@linux-foundation.org; x...@kernel.org; Haiyang Zhang Subject: Re: [PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper- V detection code On Tue, 2 Aug 2011, K. Y. Srinivasan wrote: The Hyper-V timesource driver is best integrated with Hyper-V detection code since: (a) Linux guests running on Hyper-V need this timesource and (b) by integrating with Hyper-V detection, we could significantly minimize the code in the timesource driver. Andrew, could you take this patch for the -mm tree. I have sent this patch out multiple times and I have not recived any response or comments. Signed-off-by: K. Y. Srinivasan k...@microsoft.com Signed-off-by: Haiyang Zhang haiya...@microsoft.com Acked-by: Thomas Gleixner t...@linutronix.de Thanks Thomas. As you are one of the maintainers, would you be taking this patch? Regards, K. Y ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/virtualization
[PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
The Hyper-V timesource driver is best integrated with Hyper-V detection code
since: (a) Linux guests running on Hyper-V need this timesource and (b)
by integrating with Hyper-V detection, we could significantly minimize the
code in the timesource driver.
Andrew, could you take this patch for the -mm tree. I have sent this patch
out multiple times and I have not recived any response or comments.
Signed-off-by: K. Y. Srinivasan k...@microsoft.com
Signed-off-by: Haiyang Zhang haiya...@microsoft.com
---
arch/x86/kernel/cpu/mshyperv.c | 24
drivers/staging/hv/Makefile|2 +-
drivers/staging/hv/hv_timesource.c | 102
3 files changed, 25 insertions(+), 103 deletions(-)
delete mode 100644 drivers/staging/hv/hv_timesource.c
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index d944bf6..c97f88d 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -11,6 +11,8 @@
*/
#include linux/types.h
+#include linux/time.h
+#include linux/clocksource.h
#include linux/module.h
#include asm/processor.h
#include asm/hypervisor.h
@@ -36,6 +38,25 @@ static bool __init ms_hyperv_platform(void)
!memcmp(Microsoft Hv, hyp_signature, 12);
}
+static cycle_t read_hv_clock(struct clocksource *arg)
+{
+ cycle_t current_tick;
+ /*
+* Read the partition counter to get the current tick count. This count
+* is set to 0 when the partition is created and is incremented in
+* 100 nanosecond units.
+*/
+ rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
+ return current_tick;
+}
+
+static struct clocksource hyperv_cs = {
+ .name = hyperv_clocksource,
+ .rating = 400, /* use this when running on Hyperv*/
+ .read = read_hv_clock,
+ .mask = CLOCKSOURCE_MASK(64),
+};
+
static void __init ms_hyperv_init_platform(void)
{
/*
@@ -46,6 +67,9 @@ static void __init ms_hyperv_init_platform(void)
printk(KERN_INFO HyperV: features 0x%x, hints 0x%x\n,
ms_hyperv.features, ms_hyperv.hints);
+
+
+ clocksource_register_hz(hyperv_cs, NSEC_PER_SEC/100);
}
const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index bd176b1..3e0d7e6 100644
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_HYPERV) += hv_vmbus.o hv_timesource.o
+obj-$(CONFIG_HYPERV) += hv_vmbus.o
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
diff --git a/drivers/staging/hv/hv_timesource.c
b/drivers/staging/hv/hv_timesource.c
deleted file mode 100644
index 0efb049..000
--- a/drivers/staging/hv/hv_timesource.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * A clocksource for Linux running on HyperV.
- *
- *
- * Copyright (C) 2010, Novell, Inc.
- * Author : K. Y. Srinivasan ksriniva...@novell.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#define pr_fmt(fmt) KBUILD_MODNAME : fmt
-
-#include linux/version.h
-#include linux/clocksource.h
-#include linux/init.h
-#include linux/module.h
-#include linux/pci.h
-#include linux/dmi.h
-#include asm/hyperv.h
-#include asm/mshyperv.h
-#include asm/hypervisor.h
-
-#define HV_CLOCK_SHIFT 22
-
-static cycle_t read_hv_clock(struct clocksource *arg)
-{
- cycle_t current_tick;
- /*
-* Read the partition counter to get the current tick count. This count
-* is set to 0 when the partition is created and is incremented in
-* 100 nanosecond units.
-*/
- rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
- return current_tick;
-}
-
-static struct clocksource hyperv_cs = {
- .name = hyperv_clocksource,
- .rating = 400, /* use this when running on Hyperv*/
- .read = read_hv_clock,
- .mask = CLOCKSOURCE_MASK(64),
- /*
-* The time ref counter in HyperV is in 100ns units.
-* The definition of mult is:
-* mult/2^shift = ns/cyc = 100
-* mult = (100 shift)
-*/
- .mult = (100 HV_CLOCK_SHIFT),
- .shift
RE: [PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
-Original Message-
From: K. Y. Srinivasan [mailto:k...@microsoft.com]
Sent: Friday, July 15, 2011 9:01 PM
To: gre...@suse.de; linux-ker...@vger.kernel.org;
de...@linuxdriverproject.org; virtualizat...@lists.osdl.org;
t...@linutronix.de
Cc: KY Srinivasan; Haiyang Zhang
Subject: [PATCH 1/1] Staging: hv: Integrate the time source driver with
Hyper-V
detection code
The Hyper-V timesource driver is best integrated with Hyper-V detection code
since: (a) Linux guests running on Hyper-V need this timesource and (b)
by integrating with Hyper-V detection, we could significantly minimize the
code in the timesource driver.
Thomas,
A number of weeks ago you had reviewed the time Hyper-V time source driver code
and recommended that I merge it with Hyper-V detection code. That is exactly
what I
have done here. Is this what you had in mind; your feedback would be greatly
appreciated.
I had sent this patch a couple of weeks ago and got no response. As an X86
maintainer,
would you be willing to take this patch.
Regards,
K. Y
Signed-off-by: K. Y. Srinivasan k...@microsoft.com
Signed-off-by: Haiyang Zhang haiya...@microsoft.com
---
arch/x86/kernel/cpu/mshyperv.c | 24
drivers/staging/hv/Makefile|2 +-
drivers/staging/hv/hv_timesource.c | 102
3 files changed, 25 insertions(+), 103 deletions(-)
delete mode 100644 drivers/staging/hv/hv_timesource.c
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index d944bf6..c97f88d 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -11,6 +11,8 @@
*/
#include linux/types.h
+#include linux/time.h
+#include linux/clocksource.h
#include linux/module.h
#include asm/processor.h
#include asm/hypervisor.h
@@ -36,6 +38,25 @@ static bool __init ms_hyperv_platform(void)
!memcmp(Microsoft Hv, hyp_signature, 12);
}
+static cycle_t read_hv_clock(struct clocksource *arg)
+{
+ cycle_t current_tick;
+ /*
+ * Read the partition counter to get the current tick count. This count
+ * is set to 0 when the partition is created and is incremented in
+ * 100 nanosecond units.
+ */
+ rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
+ return current_tick;
+}
+
+static struct clocksource hyperv_cs = {
+ .name = hyperv_clocksource,
+ .rating = 400, /* use this when running on Hyperv*/
+ .read = read_hv_clock,
+ .mask = CLOCKSOURCE_MASK(64),
+};
+
static void __init ms_hyperv_init_platform(void)
{
/*
@@ -46,6 +67,9 @@ static void __init ms_hyperv_init_platform(void)
printk(KERN_INFO HyperV: features 0x%x, hints 0x%x\n,
ms_hyperv.features, ms_hyperv.hints);
+
+
+ clocksource_register_hz(hyperv_cs, NSEC_PER_SEC/100);
}
const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index bd176b1..3e0d7e6 100644
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_HYPERV) += hv_vmbus.o hv_timesource.o
+obj-$(CONFIG_HYPERV) += hv_vmbus.o
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
diff --git a/drivers/staging/hv/hv_timesource.c
b/drivers/staging/hv/hv_timesource.c
deleted file mode 100644
index 0efb049..000
--- a/drivers/staging/hv/hv_timesource.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * A clocksource for Linux running on HyperV.
- *
- *
- * Copyright (C) 2010, Novell, Inc.
- * Author : K. Y. Srinivasan ksriniva...@novell.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#define pr_fmt(fmt) KBUILD_MODNAME : fmt
-
-#include linux/version.h
-#include linux/clocksource.h
-#include linux/init.h
-#include linux/module.h
-#include linux/pci.h
-#include linux/dmi.h
-#include asm/hyperv.h
-#include asm/mshyperv.h
-#include asm/hypervisor.h
-
-#define HV_CLOCK_SHIFT 22
-
-static cycle_t read_hv_clock(struct clocksource *arg)
-{
- cycle_t current_tick;
- /*
- * Read the partition counter to get the current tick
[PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
The Hyper-V timesource driver is best integrated with Hyper-V detection code
since: (a) Linux guests running on Hyper-V need this timesource and (b)
by integrating with Hyper-V detection, we could significantly minimize the
code in the timesource driver.
Signed-off-by: K. Y. Srinivasan k...@microsoft.com
Signed-off-by: Haiyang Zhang haiya...@microsoft.com
---
arch/x86/kernel/cpu/mshyperv.c | 24
drivers/staging/hv/Makefile|2 +-
drivers/staging/hv/hv_timesource.c | 102
3 files changed, 25 insertions(+), 103 deletions(-)
delete mode 100644 drivers/staging/hv/hv_timesource.c
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index d944bf6..c97f88d 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -11,6 +11,8 @@
*/
#include linux/types.h
+#include linux/time.h
+#include linux/clocksource.h
#include linux/module.h
#include asm/processor.h
#include asm/hypervisor.h
@@ -36,6 +38,25 @@ static bool __init ms_hyperv_platform(void)
!memcmp(Microsoft Hv, hyp_signature, 12);
}
+static cycle_t read_hv_clock(struct clocksource *arg)
+{
+ cycle_t current_tick;
+ /*
+* Read the partition counter to get the current tick count. This count
+* is set to 0 when the partition is created and is incremented in
+* 100 nanosecond units.
+*/
+ rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
+ return current_tick;
+}
+
+static struct clocksource hyperv_cs = {
+ .name = hyperv_clocksource,
+ .rating = 400, /* use this when running on Hyperv*/
+ .read = read_hv_clock,
+ .mask = CLOCKSOURCE_MASK(64),
+};
+
static void __init ms_hyperv_init_platform(void)
{
/*
@@ -46,6 +67,9 @@ static void __init ms_hyperv_init_platform(void)
printk(KERN_INFO HyperV: features 0x%x, hints 0x%x\n,
ms_hyperv.features, ms_hyperv.hints);
+
+
+ clocksource_register_hz(hyperv_cs, NSEC_PER_SEC/100);
}
const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index bd176b1..3e0d7e6 100644
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_HYPERV) += hv_vmbus.o hv_timesource.o
+obj-$(CONFIG_HYPERV) += hv_vmbus.o
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
diff --git a/drivers/staging/hv/hv_timesource.c
b/drivers/staging/hv/hv_timesource.c
deleted file mode 100644
index 0efb049..000
--- a/drivers/staging/hv/hv_timesource.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * A clocksource for Linux running on HyperV.
- *
- *
- * Copyright (C) 2010, Novell, Inc.
- * Author : K. Y. Srinivasan ksriniva...@novell.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#define pr_fmt(fmt) KBUILD_MODNAME : fmt
-
-#include linux/version.h
-#include linux/clocksource.h
-#include linux/init.h
-#include linux/module.h
-#include linux/pci.h
-#include linux/dmi.h
-#include asm/hyperv.h
-#include asm/mshyperv.h
-#include asm/hypervisor.h
-
-#define HV_CLOCK_SHIFT 22
-
-static cycle_t read_hv_clock(struct clocksource *arg)
-{
- cycle_t current_tick;
- /*
-* Read the partition counter to get the current tick count. This count
-* is set to 0 when the partition is created and is incremented in
-* 100 nanosecond units.
-*/
- rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
- return current_tick;
-}
-
-static struct clocksource hyperv_cs = {
- .name = hyperv_clocksource,
- .rating = 400, /* use this when running on Hyperv*/
- .read = read_hv_clock,
- .mask = CLOCKSOURCE_MASK(64),
- /*
-* The time ref counter in HyperV is in 100ns units.
-* The definition of mult is:
-* mult/2^shift = ns/cyc = 100
-* mult = (100 shift)
-*/
- .mult = (100 HV_CLOCK_SHIFT),
- .shift = HV_CLOCK_SHIFT,
-};
-
-static const struct dmi_system_id __initconst
-hv_timesource_dmi_table[] __maybe_unused = {
- {
-
[PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
The Hyper-V timesource driver is best integrated with Hyper-V detection code
since: (a) Linux guests running on Hyper-V need this timesource and (b)
by integrating with Hyper-V detection, we could minimize the code in the
timesource driver. Greg, you had helped me initially in getting the Hyper-V
detection code into the kernel (mshyperv.c). I am hoping you can take
this patch.
Signed-off-by: K. Y. Srinivasan k...@microsoft.com
Signed-off-by: Haiyang Zhang haiya...@microsoft.com
---
arch/x86/kernel/cpu/mshyperv.c | 24
drivers/staging/hv/Makefile|2 +-
drivers/staging/hv/hv_timesource.c | 102
3 files changed, 25 insertions(+), 103 deletions(-)
delete mode 100644 drivers/staging/hv/hv_timesource.c
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index d944bf6..c97f88d 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -11,6 +11,8 @@
*/
#include linux/types.h
+#include linux/time.h
+#include linux/clocksource.h
#include linux/module.h
#include asm/processor.h
#include asm/hypervisor.h
@@ -36,6 +38,25 @@ static bool __init ms_hyperv_platform(void)
!memcmp(Microsoft Hv, hyp_signature, 12);
}
+static cycle_t read_hv_clock(struct clocksource *arg)
+{
+ cycle_t current_tick;
+ /*
+* Read the partition counter to get the current tick count. This count
+* is set to 0 when the partition is created and is incremented in
+* 100 nanosecond units.
+*/
+ rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
+ return current_tick;
+}
+
+static struct clocksource hyperv_cs = {
+ .name = hyperv_clocksource,
+ .rating = 400, /* use this when running on Hyperv*/
+ .read = read_hv_clock,
+ .mask = CLOCKSOURCE_MASK(64),
+};
+
static void __init ms_hyperv_init_platform(void)
{
/*
@@ -46,6 +67,9 @@ static void __init ms_hyperv_init_platform(void)
printk(KERN_INFO HyperV: features 0x%x, hints 0x%x\n,
ms_hyperv.features, ms_hyperv.hints);
+
+
+ clocksource_register_hz(hyperv_cs, NSEC_PER_SEC/100);
}
const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index bd176b1..3e0d7e6 100644
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_HYPERV) += hv_vmbus.o hv_timesource.o
+obj-$(CONFIG_HYPERV) += hv_vmbus.o
obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o
obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o
diff --git a/drivers/staging/hv/hv_timesource.c
b/drivers/staging/hv/hv_timesource.c
deleted file mode 100644
index 0efb049..000
--- a/drivers/staging/hv/hv_timesource.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * A clocksource for Linux running on HyperV.
- *
- *
- * Copyright (C) 2010, Novell, Inc.
- * Author : K. Y. Srinivasan ksriniva...@novell.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
- * NON INFRINGEMENT. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#define pr_fmt(fmt) KBUILD_MODNAME : fmt
-
-#include linux/version.h
-#include linux/clocksource.h
-#include linux/init.h
-#include linux/module.h
-#include linux/pci.h
-#include linux/dmi.h
-#include asm/hyperv.h
-#include asm/mshyperv.h
-#include asm/hypervisor.h
-
-#define HV_CLOCK_SHIFT 22
-
-static cycle_t read_hv_clock(struct clocksource *arg)
-{
- cycle_t current_tick;
- /*
-* Read the partition counter to get the current tick count. This count
-* is set to 0 when the partition is created and is incremented in
-* 100 nanosecond units.
-*/
- rdmsrl(HV_X64_MSR_TIME_REF_COUNT, current_tick);
- return current_tick;
-}
-
-static struct clocksource hyperv_cs = {
- .name = hyperv_clocksource,
- .rating = 400, /* use this when running on Hyperv*/
- .read = read_hv_clock,
- .mask = CLOCKSOURCE_MASK(64),
- /*
-* The time ref counter in HyperV is in 100ns units.
-* The definition of mult is:
-* mult/2^shift = ns/cyc = 100
-* mult = (100 shift)
-*/
- .mult = (100 HV_CLOCK_SHIFT),
- .shift =
Re: [PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
On Wed, Jun 29, 2011 at 12:06:04PM -0700, K. Y. Srinivasan wrote: The Hyper-V timesource driver is best integrated with Hyper-V detection code since: (a) Linux guests running on Hyper-V need this timesource and (b) by integrating with Hyper-V detection, we could minimize the code in the timesource driver. Greg, you had helped me initially in getting the Hyper-V detection code into the kernel (mshyperv.c). I am hoping you can take this patch. Nope, it needs to go through the x86 maintainers, please resend it to them. The scripts/get_maintainer.pl file should have told you this, right? thanks, greg k-h ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/virtualization
RE: [PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper-V detection code
-Original Message- From: Greg KH [mailto:gre...@suse.de] Sent: Wednesday, June 29, 2011 3:07 PM To: KY Srinivasan Cc: linux-ker...@vger.kernel.org; de...@linuxdriverproject.org; virtualizat...@lists.osdl.org; Haiyang Zhang Subject: Re: [PATCH 1/1] Staging: hv: Integrate the time source driver with Hyper- V detection code On Wed, Jun 29, 2011 at 12:06:04PM -0700, K. Y. Srinivasan wrote: The Hyper-V timesource driver is best integrated with Hyper-V detection code since: (a) Linux guests running on Hyper-V need this timesource and (b) by integrating with Hyper-V detection, we could minimize the code in the timesource driver. Greg, you had helped me initially in getting the Hyper-V detection code into the kernel (mshyperv.c). I am hoping you can take this patch. Nope, it needs to go through the x86 maintainers, please resend it to them. The scripts/get_maintainer.pl file should have told you this, right? Thanks Greg. I have done what you have recommended. Regards, K. Y ___ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/virtualization
