WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

RE: [Xen-devel] [PATCH] Append 'nohpet' in dom0 cmdline to prevent dom0

To: "Wei, Gang" <gang.wei@xxxxxxxxx>, Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Subject: RE: [Xen-devel] [PATCH] Append 'nohpet' in dom0 cmdline to prevent dom0 from using HPET
From: "Wei, Gang" <gang.wei@xxxxxxxxx>
Date: Fri, 16 Oct 2009 10:19:08 +0800
Accept-language: en-US
Acceptlanguage: en-US
Cc: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxx>, Keir Fraser <keir.fraser@xxxxxxxxxxxxx>
Delivery-date: Thu, 15 Oct 2009 19:20:24 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <8FED46E8A9CA574792FC7AACAC38FE7714FCC2F471@xxxxxxxxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <8FED46E8A9CA574792FC7AACAC38FE7714FCC2ED95@xxxxxxxxxxxxxxxxxxxxxxxxxxxx> <4AD62D4A.7030301@xxxxxxxx> <8FED46E8A9CA574792FC7AACAC38FE7714FCC2EFBF@xxxxxxxxxxxxxxxxxxxxxxxxxxxx> <4AD75A7B.7000404@xxxxxxxx> <8FED46E8A9CA574792FC7AACAC38FE7714FCC2F471@xxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Thread-index: AcpNvDMUBU1ytQ26QECrTK/0zVK1mgAQNI4gAAHssOA=
Thread-topic: [Xen-devel] [PATCH] Append 'nohpet' in dom0 cmdline to prevent dom0 from using HPET
Wei, Gang wrote:
> Jeremy Fitzhardinge wrote:
>> Well, making disable_hpet() non-static and calling it from Xen setup
>> is the same as appending nohpet to the command line, but less hacky.
> 
> Yes, you are right. I mixed disable_hpet() with hpet_disable(). I
> just try to avoid changes in normal kernel code. If such slight
> change is acceptable, please just make it this way.  

Here is the new patch.

diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 9b32c88..366e1e5 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -96,7 +96,7 @@ static int __init hpet_setup(char *str)
 }
 __setup("hpet=", hpet_setup);
 
-static int __init disable_hpet(char *str)
+int __init disable_hpet(char *str)
 {
        boot_hpet_disable = 1;
        return 1;
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 5eeeedb..3774578 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -34,6 +34,10 @@ extern void xen_sysenter_target(void);
 extern void xen_syscall_target(void);
 extern void xen_syscall32_target(void);
 
+#ifdef CONFIG_HPET_TIMER
+extern int __init disable_hpet(char *str);
+#endif
+
 static unsigned long __init xen_release_chunk(phys_addr_t start_addr, 
phys_addr_t end_addr)
 {
        struct xen_memory_reservation reservation = {
@@ -280,6 +284,10 @@ void __init xen_arch_setup(void)
                printk(KERN_INFO "ACPI in unprivileged domain disabled\n");
                disable_acpi();
        }
+#endif 
+
+#ifdef CONFIG_HPET_TIMER
+       disable_hpet(NULL);
 #endif
 
        memcpy(boot_command_line, xen_start_info->cmd_line,

Jimmy

Attachment: pv-dom0-nohpet-v2.patch
Description: pv-dom0-nohpet-v2.patch

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel