Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=296d93cd0205433489b0689533426ce0a8cf2dec
Commit: 296d93cd0205433489b0689533426ce0a8cf2dec
Parent: 12998096cc48563a04ca751965ba17c3f73a5461
Author: Linus Torvalds <[EMAIL PROTECTED]>
AuthorDate: Fri Mar 23 08:03:47 2007 -0700
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Mar 23 08:03:47 2007 -0700
Revert "ACPI: Only use IPI on known broken machines (AMD,
Dothan/BaniasPentium M)"
This reverts commit 25496caec111481161e7f06bbfa12a533c43cc6f, which
broke bootup on at least Ingo's ThinkPad T60. Need to figure out
exactly what is wrong before we can re-do the logic.
Requested-by: Ingo Molnar <[EMAIL PROTECTED]>
Acked-by: Thomas Gleixner <[EMAIL PROTECTED]>
Cc: Thomas Renninger <[EMAIL PROTECTED]>
Cc: Len Brown <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
drivers/acpi/processor_idle.c | 38 +++++++++-----------------------------
1 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 562124e..6077300 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -89,12 +89,6 @@ module_param(nocst, uint, 0000);
static unsigned int bm_history __read_mostly =
(HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));
module_param(bm_history, uint, 0644);
-
-static unsigned use_ipi = 2;
-module_param(use_ipi, uint, 0644);
-MODULE_PARM_DESC(use_ipi, "IPI (vs. LAPIC) irqs for not waking up from C2/C3"
- " machines. 0=apic, 1=ipi, 2=auto\n");
-
/* --------------------------------------------------------------------------
Power Management
--------------------------------------------------------------------------
*/
@@ -266,8 +260,9 @@ static void acpi_cstate_enter(struct acpi_processor_cx
*cstate)
/*
* Some BIOS implementations switch to C3 in the published C2 state.
- * This seems to be a common problem on AMD boxen and Intel Dothan/Banias
- * Pentium M machines.
+ * This seems to be a common problem on AMD boxen, but other vendors
+ * are affected too. We pick the most conservative approach: we assume
+ * that the local APIC stops in both C2 and C3.
*/
static void acpi_timer_check_state(int state, struct acpi_processor *pr,
struct acpi_processor_cx *cx)
@@ -281,17 +276,8 @@ static void acpi_timer_check_state(int state, struct
acpi_processor *pr,
if (pwr->timer_broadcast_on_state < state)
return;
- if (cx->type >= ACPI_STATE_C2) {
- if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
- pr->power.timer_broadcast_on_state = state;
- else if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&
- boot_cpu_data.x86 == 6) &&
- (boot_cpu_data.x86_model == 13 ||
- boot_cpu_data.x86_model == 9))
- {
- pr->power.timer_broadcast_on_state = state;
- }
- }
+ if (cx->type >= ACPI_STATE_C2)
+ pr->power.timer_broadcast_on_state = state;
}
static void acpi_propagate_timer_broadcast(struct acpi_processor *pr)
@@ -306,16 +292,10 @@ static void acpi_propagate_timer_broadcast(struct
acpi_processor *pr)
#else
cpumask_t mask = cpumask_of_cpu(pr->id);
- if (use_ipi == 0)
+ if (pr->power.timer_broadcast_on_state < INT_MAX)
on_each_cpu(switch_APIC_timer_to_ipi, &mask, 1, 1);
- else if (use_ipi == 1)
+ else
on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1);
- else {
- if (pr->power.timer_broadcast_on_state < INT_MAX)
- on_each_cpu(switch_APIC_timer_to_ipi, &mask, 1, 1);
- else
- on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1);
- }
#endif
}
@@ -1033,13 +1013,13 @@ static int acpi_processor_power_verify(struct
acpi_processor *pr)
case ACPI_STATE_C2:
acpi_processor_power_verify_c2(cx);
- if (cx->valid && use_ipi != 0 && use_ipi != 1)
+ if (cx->valid)
acpi_timer_check_state(i, pr, cx);
break;
case ACPI_STATE_C3:
acpi_processor_power_verify_c3(pr, cx);
- if (cx->valid && use_ipi != 0 && use_ipi != 1)
+ if (cx->valid)
acpi_timer_check_state(i, pr, cx);
break;
}
-
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
