From 7f2bd3e2742d8967f88b78f31c5871bd9322fbd4 Mon Sep 17 00:00:00 2001
From: Lin Ming <ming.m.lin@intel.com>
Date: Fri, 15 May 2009 22:27:49 -0400
Subject: [PATCH] --- yaml --- r: 145058 b: refs/heads/master c:
 975b3c474c13d29337eaf7da8f5f5c0299e4943f h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/acpi/acpica/aclocal.h       |  7 ++++++-
 trunk/drivers/acpi/processor_throttling.c | 25 -----------------------
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 21ed64c806d5..0d8cb0906d65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4973b22aa8c70fe036e3e0039f104cf5bb7fe2b1
+refs/heads/master: 975b3c474c13d29337eaf7da8f5f5c0299e4943f
diff --git a/trunk/drivers/acpi/acpica/aclocal.h b/trunk/drivers/acpi/acpica/aclocal.h
index 772ee5c4ccca..2ec394a328e9 100644
--- a/trunk/drivers/acpi/acpica/aclocal.h
+++ b/trunk/drivers/acpi/acpica/aclocal.h
@@ -787,7 +787,12 @@ struct acpi_bit_register_info {
 
 /* For control registers, both ignored and reserved bits must be preserved */
 
-#define ACPI_PM1_CONTROL_IGNORED_BITS           0x0201	/* Bits 9, 0(SCI_EN) */
+/*
+ * The ACPI spec says to ignore PM1_CTL.SCI_EN (bit 0)
+ * but we need to be able to write ACPI_BITREG_SCI_ENABLE directly
+ * as a BIOS workaround on some machines.
+ */
+#define ACPI_PM1_CONTROL_IGNORED_BITS           0x0200	/* Bits 9 */
 #define ACPI_PM1_CONTROL_RESERVED_BITS          0xC1F8	/* Bits 14-15, 3-8 */
 #define ACPI_PM1_CONTROL_PRESERVED_BITS \
 	       (ACPI_PM1_CONTROL_IGNORED_BITS | ACPI_PM1_CONTROL_RESERVED_BITS)
diff --git a/trunk/drivers/acpi/processor_throttling.c b/trunk/drivers/acpi/processor_throttling.c
index 7f16f5f8e7d3..d0d1f4d50434 100644
--- a/trunk/drivers/acpi/processor_throttling.c
+++ b/trunk/drivers/acpi/processor_throttling.c
@@ -45,14 +45,6 @@
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_throttling");
 
-/* ignore_tpc:
- *  0 -> acpi processor driver doesn't ignore _TPC values
- *  1 -> acpi processor driver ignores _TPC values
- */
-static int ignore_tpc;
-module_param(ignore_tpc, int, 0644);
-MODULE_PARM_DESC(ignore_tpc, "Disable broken BIOS _TPC throttling support");
-
 struct throttling_tstate {
 	unsigned int cpu;		/* cpu nr */
 	int target_state;		/* target T-state */
@@ -291,10 +283,6 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
 
 	if (!pr)
 		return -EINVAL;
-
-	if (ignore_tpc)
-		goto end;
-
 	status = acpi_evaluate_integer(pr->handle, "_TPC", NULL, &tpc);
 	if (ACPI_FAILURE(status)) {
 		if (status != AE_NOT_FOUND) {
@@ -302,8 +290,6 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
 		}
 		return -ENODEV;
 	}
-
-end:
 	pr->throttling_platform_limit = (int)tpc;
 	return 0;
 }
@@ -316,9 +302,6 @@ int acpi_processor_tstate_has_changed(struct acpi_processor *pr)
 	struct acpi_processor_limit *limit;
 	int target_state;
 
-	if (ignore_tpc)
-		return 0;
-
 	result = acpi_processor_get_platform_limit(pr);
 	if (result) {
 		/* Throttling Limit is unsupported */
@@ -838,14 +821,6 @@ static int acpi_processor_get_throttling_ptc(struct acpi_processor *pr)
 	ret = acpi_read_throttling_status(pr, &value);
 	if (ret >= 0) {
 		state = acpi_get_throttling_state(pr, value);
-		if (state == -1) {
-			ACPI_WARNING((AE_INFO,
-				"Invalid throttling state, reset\n"));
-			state = 0;
-			ret = acpi_processor_set_throttling(pr, state);
-			if (ret)
-				return ret;
-		}
 		pr->throttling.state = state;
 	}