Commit 12b9e486 authored by Len Brown's avatar Len Brown

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0

into intel.com:/home/lenb/bk/linux-acpi-test-2.6.0
parents 39d7c3e1 3d8cfd21
...@@ -231,7 +231,7 @@ acpi_processor_set_performance ( ...@@ -231,7 +231,7 @@ acpi_processor_set_performance (
int state) int state)
{ {
u16 port = 0; u16 port = 0;
u8 value = 0; u16 value = 0;
int i = 0; int i = 0;
struct cpufreq_freqs cpufreq_freqs; struct cpufreq_freqs cpufreq_freqs;
...@@ -282,9 +282,9 @@ acpi_processor_set_performance ( ...@@ -282,9 +282,9 @@ acpi_processor_set_performance (
value = (u16) perf->states[state].control; value = (u16) perf->states[state].control;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Writing 0x%02x to port 0x%04x\n", value, port)); "Writing 0x%04x to port 0x%04x\n", value, port));
outb(value, port); outw(value, port);
/* /*
* Then we read the 'status_register' and compare the value with the * Then we read the 'status_register' and compare the value with the
...@@ -296,12 +296,12 @@ acpi_processor_set_performance ( ...@@ -296,12 +296,12 @@ acpi_processor_set_performance (
port = perf->status_register; port = perf->status_register;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Looking for 0x%02x from port 0x%04x\n", "Looking for 0x%04x from port 0x%04x\n",
(u8) perf->states[state].status, port)); (u16) perf->states[state].status, port));
for (i=0; i<100; i++) { for (i=0; i<100; i++) {
value = inb(port); value = inw(port);
if (value == (u8) perf->states[state].status) if (value == (u16) perf->states[state].status)
break; break;
udelay(10); udelay(10);
} }
...@@ -309,7 +309,7 @@ acpi_processor_set_performance ( ...@@ -309,7 +309,7 @@ acpi_processor_set_performance (
/* notify cpufreq */ /* notify cpufreq */
cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE); cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
if (value != perf->states[state].status) { if (value != (u16) perf->states[state].status) {
unsigned int tmp = cpufreq_freqs.new; unsigned int tmp = cpufreq_freqs.new;
cpufreq_freqs.new = cpufreq_freqs.old; cpufreq_freqs.new = cpufreq_freqs.old;
cpufreq_freqs.old = tmp; cpufreq_freqs.old = tmp;
......
...@@ -40,41 +40,15 @@ config ACPI ...@@ -40,41 +40,15 @@ config ACPI
available at: available at:
<http://www.acpi.info> <http://www.acpi.info>
config ACPI_HT_ONLY
bool "Restrict ACPI to minimum boot code to enable HT"
depends on X86
depends on ACPI
depends on SMP
default n
---help---
ACPI enumerates both logical (a.k.a. Hyper-Threaded -- HT)
and physical processors. It is designed to obsolete several older
specifications, including the MultiProcessor Specification (MPS),
which supported only physical processors.
CONFIG_ACPI_HT_ONLY includes just the minimal ACPI boot-time code
necessary to enumerate logical processors and enable HT.
CONFIG_ACPI includes this, plus IO APIC enumeration,
and the hooks to run the ACPI AML interpreter for run-time events.
When CONFIG_ACPI is selected, the command-line option "acpi=ht"
is available to run just the ACPI boot-time code -- just as if
only CONFIG_ACPI_HT_ONLY were selected.
Note that "acpi=off" can be used to disable all ACPI code in the kernel.
config ACPI_BOOT config ACPI_BOOT
bool bool
depends on ACPI depends on ACPI || X86_HT
default y default y
config ACPI_INTERPRETER config ACPI_INTERPRETER
bool bool
depends on ACPI depends on ACPI
depends on !IA64_SGI_SN depends on !IA64_SGI_SN
depends on !ACPI_HT_ONLY
default y default y
config ACPI_SLEEP config ACPI_SLEEP
...@@ -281,7 +255,7 @@ config ACPI_EFI ...@@ -281,7 +255,7 @@ config ACPI_EFI
default y default y
config ACPI_RELAXED_AML config ACPI_RELAXED_AML
bool bool "Relaxed AML"
depends on ACPI_INTERPRETER depends on ACPI_INTERPRETER
depends on !IA64_SGI_SN depends on !IA64_SGI_SN
default n default n
......
...@@ -500,7 +500,6 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) { ...@@ -500,7 +500,6 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) {
irq = link->irq.active; irq = link->irq.active;
} else { } else {
irq = link->irq.possible[0]; irq = link->irq.possible[0];
}
/* /*
* Select the best IRQ. This is done in reverse to promote * Select the best IRQ. This is done in reverse to promote
...@@ -510,6 +509,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) { ...@@ -510,6 +509,7 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) {
if (acpi_irq_penalty[irq] > acpi_irq_penalty[link->irq.possible[i]]) if (acpi_irq_penalty[irq] > acpi_irq_penalty[link->irq.possible[i]])
irq = link->irq.possible[i]; irq = link->irq.possible[i];
} }
}
/* Attempt to enable the link device at this IRQ. */ /* Attempt to enable the link device at this IRQ. */
if (acpi_pci_link_set(link, irq)) { if (acpi_pci_link_set(link, irq)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment