diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 11:45:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 11:45:15 -0500 |
commit | 1a2edea9aff48c31302e07100ddbaba358596cd7 (patch) | |
tree | 7dc3c7f4b6bca030a8308537fbc7367f36c32003 /arch | |
parent | f589b86d4b6e067b720a253bdb40896857804037 (diff) | |
parent | 17d57a9206b4de6ad082ac9f2d2346985abbd2aa (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix x86-32 early fixmap initialization.
x86: disable hpet legacy replacement for kdump
x86: disable hpet on shutdown
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/crash.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/head_32.S | 12 | ||||
-rw-r--r-- | arch/x86/kernel/hpet.c | 14 | ||||
-rw-r--r-- | arch/x86/kernel/reboot_32.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/reboot_64.c | 4 |
5 files changed, 32 insertions, 6 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 8bb482ff091b..9a5fa0abfcc7 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <asm/nmi.h> | 22 | #include <asm/nmi.h> |
23 | #include <asm/hw_irq.h> | 23 | #include <asm/hw_irq.h> |
24 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
25 | #include <asm/hpet.h> | ||
25 | #include <linux/kdebug.h> | 26 | #include <linux/kdebug.h> |
26 | #include <asm/smp.h> | 27 | #include <asm/smp.h> |
27 | 28 | ||
@@ -140,5 +141,8 @@ void machine_crash_shutdown(struct pt_regs *regs) | |||
140 | #if defined(CONFIG_X86_IO_APIC) | 141 | #if defined(CONFIG_X86_IO_APIC) |
141 | disable_IO_APIC(); | 142 | disable_IO_APIC(); |
142 | #endif | 143 | #endif |
144 | #ifdef CONFIG_HPET_TIMER | ||
145 | hpet_disable(); | ||
146 | #endif | ||
143 | crash_save_cpu(regs, safe_smp_processor_id()); | 147 | crash_save_cpu(regs, safe_smp_processor_id()); |
144 | } | 148 | } |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 374b7ece8961..ac0637a6d71c 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -193,6 +193,12 @@ default_entry: | |||
193 | jb 10b | 193 | jb 10b |
194 | movl %edi,(init_pg_tables_end - __PAGE_OFFSET) | 194 | movl %edi,(init_pg_tables_end - __PAGE_OFFSET) |
195 | 195 | ||
196 | /* Do an early initialization of the fixmap area */ | ||
197 | movl $(swapper_pg_dir - __PAGE_OFFSET), %edx | ||
198 | movl $(swapper_pg_pmd - __PAGE_OFFSET), %eax | ||
199 | addl $0x007, %eax /* 0x007 = PRESENT+RW+USER */ | ||
200 | movl %eax, 4092(%edx) | ||
201 | |||
196 | xorl %ebx,%ebx /* This is the boot CPU (BSP) */ | 202 | xorl %ebx,%ebx /* This is the boot CPU (BSP) */ |
197 | jmp 3f | 203 | jmp 3f |
198 | /* | 204 | /* |
@@ -208,12 +214,6 @@ default_entry: | |||
208 | .section .init.text,"ax",@progbits | 214 | .section .init.text,"ax",@progbits |
209 | #endif | 215 | #endif |
210 | 216 | ||
211 | /* Do an early initialization of the fixmap area */ | ||
212 | movl $(swapper_pg_dir - __PAGE_OFFSET), %edx | ||
213 | movl $(swapper_pg_pmd - __PAGE_OFFSET), %eax | ||
214 | addl $0x007, %eax /* 0x007 = PRESENT+RW+USER */ | ||
215 | movl %eax, 4092(%edx) | ||
216 | |||
217 | #ifdef CONFIG_SMP | 217 | #ifdef CONFIG_SMP |
218 | ENTRY(startup_32_smp) | 218 | ENTRY(startup_32_smp) |
219 | cld | 219 | cld |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 53303f2e5475..4a86ffd67ec5 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -446,6 +446,20 @@ static __init int hpet_late_init(void) | |||
446 | } | 446 | } |
447 | fs_initcall(hpet_late_init); | 447 | fs_initcall(hpet_late_init); |
448 | 448 | ||
449 | void hpet_disable(void) | ||
450 | { | ||
451 | if (is_hpet_capable()) { | ||
452 | unsigned long cfg = hpet_readl(HPET_CFG); | ||
453 | |||
454 | if (hpet_legacy_int_enabled) { | ||
455 | cfg &= ~HPET_CFG_LEGACY; | ||
456 | hpet_legacy_int_enabled = 0; | ||
457 | } | ||
458 | cfg &= ~HPET_CFG_ENABLE; | ||
459 | hpet_writel(cfg, HPET_CFG); | ||
460 | } | ||
461 | } | ||
462 | |||
449 | #ifdef CONFIG_HPET_EMULATE_RTC | 463 | #ifdef CONFIG_HPET_EMULATE_RTC |
450 | 464 | ||
451 | /* HPET in LegacyReplacement Mode eats up RTC interrupt line. When, HPET | 465 | /* HPET in LegacyReplacement Mode eats up RTC interrupt line. When, HPET |
diff --git a/arch/x86/kernel/reboot_32.c b/arch/x86/kernel/reboot_32.c index 9e2269d00918..bb1a0f889c5e 100644 --- a/arch/x86/kernel/reboot_32.c +++ b/arch/x86/kernel/reboot_32.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/reboot.h> | 11 | #include <linux/reboot.h> |
12 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
13 | #include <asm/apic.h> | 13 | #include <asm/apic.h> |
14 | #include <asm/hpet.h> | ||
14 | #include <asm/desc.h> | 15 | #include <asm/desc.h> |
15 | #include "mach_reboot.h" | 16 | #include "mach_reboot.h" |
16 | #include <asm/reboot_fixups.h> | 17 | #include <asm/reboot_fixups.h> |
@@ -326,6 +327,9 @@ static void native_machine_shutdown(void) | |||
326 | #ifdef CONFIG_X86_IO_APIC | 327 | #ifdef CONFIG_X86_IO_APIC |
327 | disable_IO_APIC(); | 328 | disable_IO_APIC(); |
328 | #endif | 329 | #endif |
330 | #ifdef CONFIG_HPET_TIMER | ||
331 | hpet_disable(); | ||
332 | #endif | ||
329 | } | 333 | } |
330 | 334 | ||
331 | void __attribute__((weak)) mach_reboot_fixups(void) | 335 | void __attribute__((weak)) mach_reboot_fixups(void) |
diff --git a/arch/x86/kernel/reboot_64.c b/arch/x86/kernel/reboot_64.c index 71b13c5f5817..53620a92a8fd 100644 --- a/arch/x86/kernel/reboot_64.c +++ b/arch/x86/kernel/reboot_64.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
18 | #include <asm/tlbflush.h> | 18 | #include <asm/tlbflush.h> |
19 | #include <asm/apic.h> | 19 | #include <asm/apic.h> |
20 | #include <asm/hpet.h> | ||
20 | #include <asm/gart.h> | 21 | #include <asm/gart.h> |
21 | 22 | ||
22 | /* | 23 | /* |
@@ -113,6 +114,9 @@ void machine_shutdown(void) | |||
113 | 114 | ||
114 | disable_IO_APIC(); | 115 | disable_IO_APIC(); |
115 | 116 | ||
117 | #ifdef CONFIG_HPET_TIMER | ||
118 | hpet_disable(); | ||
119 | #endif | ||
116 | local_irq_restore(flags); | 120 | local_irq_restore(flags); |
117 | 121 | ||
118 | pci_iommu_shutdown(); | 122 | pci_iommu_shutdown(); |