GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-03-28 09:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] ACPI: repair nvidia early quirk breakage on x86_64

Browse source 
x86_64 nvidia_bugs() broke when we bailed out on not finding the HPET.
However, the quirk works by checking for _not_ finding the HPET...

Delete the nvidia_hpet_detected flag and simply test for
not finding the HPET, which is simple to do now that
acpi_table_parse returns 1 on failure.

Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Len Brown 2007-03-08 18:28:32 -05:00 • committed by Linus Torvalds
parent eb9c4f2ef7
commit fe69933652
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/i386/kernel/acpi/earlyquirk.c
View file

@ -14,11 +14,8 @@
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static int nvidia_hpet_detected __initdata;
static int __init nvidia_hpet_check(struct acpi_table_header *header) static int __init nvidia_hpet_check(struct acpi_table_header *header)
{ {
nvidia_hpet_detected = 1;
return 0; return 0;
} }
#endif #endif
@ -29,9 +26,7 @@ static int __init check_bridge(int vendor, int device)
/* According to Nvidia all timer overrides are bogus unless HPET /* According to Nvidia all timer overrides are bogus unless HPET
is enabled. */ is enabled. */
if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) { if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
nvidia_hpet_detected = 0; if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check) {
acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check);
if (nvidia_hpet_detected == 0) {
acpi_skip_timer_override = 1; acpi_skip_timer_override = 1;
printk(KERN_INFO "Nvidia board " printk(KERN_INFO "Nvidia board "
"detected. Ignoring ACPI " "detected. Ignoring ACPI "

9
arch/x86_64/kernel/early-quirks.c
View file

@ -30,11 +30,8 @@ static void via_bugs(void)
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
static int nvidia_hpet_detected __initdata;
static int __init nvidia_hpet_check(struct acpi_table_header *header) static int __init nvidia_hpet_check(struct acpi_table_header *header)
{ {
nvidia_hpet_detected = 1;
return 0; return 0;
} }
#endif #endif
@ -52,11 +49,7 @@ static void nvidia_bugs(void)
if (acpi_use_timer_override) if (acpi_use_timer_override)
return; return;
nvidia_hpet_detected = 0; if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check)) {
if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check))
return;
if (nvidia_hpet_detected == 0) {
acpi_skip_timer_override = 1; acpi_skip_timer_override = 1;
printk(KERN_INFO "Nvidia board " printk(KERN_INFO "Nvidia board "
"detected. Ignoring ACPI " "detected. Ignoring ACPI "