Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=59c69f2a51b41e9886b85f61c04e8d0d2a35f37b
Commit: 59c69f2a51b41e9886b85f61c04e8d0d2a35f37b
Parent: d54bd57d6580250e6551261f3b15c45a9d90c77b
Author: Venki Pallipadi <[EMAIL PROTECTED]>
AuthorDate: Fri Oct 12 23:04:23 2007 +0200
Committer: Thomas Gleixner <[EMAIL PROTECTED]>
CommitDate: Fri Oct 12 23:04:23 2007 +0200
x86: HPET try to activate force detected hpet
Enable HPET later during boot, after the force detect in PCI quirks. Also
add
a call to repeat the force enabling at resume time.
Signed-off-by: Venkatesh Pallipadi <[EMAIL PROTECTED]>
Cc: Andi Kleen <[EMAIL PROTECTED]>
Cc: john stultz <[EMAIL PROTECTED]>
Cc: Greg KH <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
Signed-off-by: Arjan van de Ven <[EMAIL PROTECTED]>
Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
arch/x86/kernel/hpet.c | 27 +++++++++++++++++++++++++--
include/asm-x86/hpet.h | 1 +
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index ce3bcc4..a6c6891 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -164,6 +164,7 @@ static struct clock_event_device hpet_clockevent = {
.set_next_event = hpet_legacy_next_event,
.shift = 32,
.irq = 0,
+ .rating = 50,
};
static void hpet_start_counter(void)
@@ -178,6 +179,17 @@ static void hpet_start_counter(void)
hpet_writel(cfg, HPET_CFG);
}
+static void hpet_resume_device(void)
+{
+ ich_force_hpet_resume();
+}
+
+static void hpet_restart_counter(void)
+{
+ hpet_resume_device();
+ hpet_start_counter();
+}
+
static void hpet_enable_legacy_int(void)
{
unsigned long cfg = hpet_readl(HPET_CFG);
@@ -299,7 +311,7 @@ static struct clocksource clocksource_hpet = {
.mask = HPET_MASK,
.shift = HPET_SHIFT,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
- .resume = hpet_start_counter,
+ .resume = hpet_restart_counter,
#ifdef CONFIG_X86_64
.vread = vread_hpet,
#endif
@@ -412,10 +424,21 @@ out_nohpet:
*/
static __init int hpet_late_init(void)
{
- if (!is_hpet_capable())
+ if (boot_hpet_disable)
return -ENODEV;
+ if (!hpet_address) {
+ if (!force_hpet_address)
+ return -ENODEV;
+
+ hpet_address = force_hpet_address;
+ hpet_enable();
+ if (!hpet_virt_address)
+ return -ENODEV;
+ }
+
hpet_reserve_platform_timers(hpet_readl(HPET_ID));
+
return 0;
}
fs_initcall(hpet_late_init);
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h
index 7c93324..47de4b8 100644
--- a/include/asm-x86/hpet.h
+++ b/include/asm-x86/hpet.h
@@ -63,6 +63,7 @@
/* hpet memory map physical address */
extern unsigned long hpet_address;
+extern unsigned long force_hpet_address;
extern int is_hpet_enabled(void);
extern int hpet_enable(void);
extern unsigned long hpet_readl(unsigned long a);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
