Attachment 278781 Details for Bug 393431 – disable_hpet_on_shutdown

disable_hpet_on_shutdown

disable_hpet_on_shutdown.patch (text/plain), 3.30 KB, created by IBM Bug Proxy on 2007-12-05 21:06:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2007-12-05 21:06:03 UTC

Size: 3.30 KB

patch

obsolete

>commit c86c7fbc829e27e2a4093f98ded9fbd75e515adb
>Author: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
>Date:   Mon Dec 3 17:17:10 2007 +0100
>
>    x86: disable hpet on shutdown
>    
>    If HPET was enabled by pci quirks, we use i8253 as initial clockevent
>    because pci quirks doesn't run until pci is initialized.
>    
>    The above means the kernel (or something) is assuming HPET legacy
>    replacement is disabled and can use i8253 at boot.
>    
>    If we used kexec, it isn't true. So, this patch disables HPET legacy
>    replacement for kexec in machine_shutdown().
>    
>    Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
>    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
>    Signed-off-by: Ingo Molnar <mingo@elte.hu>
>    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
>    Backported-by: Darren Hart <dvhltc@us.ibm.com>
>
>Index: linux-rt-2.6.21.4-ibmrt1.15-bz40679-view/arch/i386/kernel/hpet.c
>===================================================================
>--- linux-rt-2.6.21.4-ibmrt1.15-bz40679-view.orig/arch/i386/kernel/hpet.c
>+++ linux-rt-2.6.21.4-ibmrt1.15-bz40679-view/arch/i386/kernel/hpet.c
>@@ -447,6 +447,19 @@ static int __init hpet_late_init(void)
> }
> fs_initcall(hpet_late_init);
> 
>+void hpet_disable(void)
>+{
>+	if (is_hpet_capable()) {
>+		unsigned long cfg = hpet_readl(HPET_CFG);
>+
>+		if (hpet_legacy_int_enabled) {
>+			cfg &= ~HPET_CFG_LEGACY;
>+			hpet_legacy_int_enabled = 0;
>+		}
>+		cfg &= ~HPET_CFG_ENABLE;
>+		hpet_writel(cfg, HPET_CFG);
>+	}
>+}
> 
> #ifdef CONFIG_HPET_EMULATE_RTC
> 
>Index: linux-rt-2.6.21.4-ibmrt1.15-bz40679-view/arch/i386/kernel/reboot.c
>===================================================================
>--- linux-rt-2.6.21.4-ibmrt1.15-bz40679-view.orig/arch/i386/kernel/reboot.c
>+++ linux-rt-2.6.21.4-ibmrt1.15-bz40679-view/arch/i386/kernel/reboot.c
>@@ -15,6 +15,7 @@
> #include <linux/reboot.h>
> #include <asm/uaccess.h>
> #include <asm/apic.h>
>+#include <asm/hpet.c>
> #include <asm/desc.h>
> #include "mach_reboot.h"
> #include <linux/reboot_fixups.h>
>@@ -314,6 +315,10 @@ void machine_shutdown(void)
> #ifdef CONFIG_X86_IO_APIC
> 	disable_IO_APIC();
> #endif
>+#ifdef CONFIG_HPET_TIMER
>+	hpet_disable();
>+#endif
>+
> }
> 
> void machine_emergency_restart(void)
>Index: linux-rt-2.6.21.4-ibmrt1.15-bz40679-view/arch/x86_64/kernel/reboot.c
>===================================================================
>--- linux-rt-2.6.21.4-ibmrt1.15-bz40679-view.orig/arch/x86_64/kernel/reboot.c
>+++ linux-rt-2.6.21.4-ibmrt1.15-bz40679-view/arch/x86_64/kernel/reboot.c
>@@ -15,6 +15,7 @@
> #include <asm/pgtable.h>
> #include <asm/tlbflush.h>
> #include <asm/apic.h>
>+#include <asm/hpet.h>
> 
> /*
>  * Power off function, if any
>@@ -109,6 +110,9 @@ void machine_shutdown(void)
> 
> 	disable_IO_APIC();
> 
>+#ifdef CONFIG_HPET_TIMER
>+	hpet_disable();
>+#endif
> 	local_irq_restore(flags);
> }
> 
>Index: linux-rt-2.6.21.4-ibmrt1.15-bz40679-view/include/asm-i386/hpet.h
>===================================================================
>--- linux-rt-2.6.21.4-ibmrt1.15-bz40679-view.orig/include/asm-i386/hpet.h
>+++ linux-rt-2.6.21.4-ibmrt1.15-bz40679-view/include/asm-i386/hpet.h
>@@ -67,6 +67,7 @@ extern unsigned long hpet_address;
> extern unsigned long force_hpet_address;
> extern int is_hpet_enabled(void);
> extern int hpet_enable(void);
>+extern void hpet_disable(void);
> 
> #ifdef CONFIG_X86_64
> /* hpet_readl/writel defines */

Actions: View

Attachments on bug 393431: 268701 | 268711 | 277101 | 278781 | 278791