lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: add force_hpet boot option

Browse Source 
add force_hpet boot option.

(this will be useful to make the forced-enable quirks depend on.)

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner
2007-10-19 20:35:02 +02:00
parent 764922376c
commit b17530bda2
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/kernel-parameters.txt
View File

@@ -431,8 +431,10 @@ and is between 256 and 4096 characters. It is defined in the file
over the 8254 in addition to over the IO-APIC. The over the 8254 in addition to over the IO-APIC. The
kernel tries to set a sensible default. kernel tries to set a sensible default.
hpet= [X86-32,HPET] option to disable HPET and use PIT. hpet= [X86-32,HPET] option to control HPET usage
Format: disable Format: { enable (default) | disable | force }
disable: disable HPET and use PIT instead
force: allow force enabled of undocumented chips (ICH4, VIA)
com20020= [HW,NET] ARCnet - COM20020 chipset com20020= [HW,NET] ARCnet - COM20020 chipset
Format: Format:

3
arch/x86/kernel/hpet.c
View File

@@ -69,12 +69,15 @@ static inline void hpet_clear_mapping(void)
* HPET command line enable / disable * HPET command line enable / disable
*/ */
static int boot_hpet_disable; static int boot_hpet_disable;
int hpet_force_user;
static int __init hpet_setup(char* str) static int __init hpet_setup(char* str)
{ {
if (str) { if (str) {
if (!strncmp("disable", str, 7)) if (!strncmp("disable", str, 7))
boot_hpet_disable = 1; boot_hpet_disable = 1;
if (!strncmp("force", str, 5))
hpet_force_user = 1;
} }
return 1; return 1;
} }

1
include/asm-x86/hpet.h
View File

@@ -64,6 +64,7 @@
/* hpet memory map physical address */ /* hpet memory map physical address */
extern unsigned long hpet_address; extern unsigned long hpet_address;
extern unsigned long force_hpet_address; extern unsigned long force_hpet_address;
extern int hpet_force_user;
extern int is_hpet_enabled(void); extern int is_hpet_enabled(void);
extern int hpet_enable(void); extern int hpet_enable(void);
extern unsigned long hpet_readl(unsigned long a); extern unsigned long hpet_readl(unsigned long a);