ACPI: enable MWAIT for C1 idle

Add MWAIT idle for C1 state instead of halt, on platforms that support C1 state with MWAIT. Renames cx->space_id to something more appropriate. Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>

ACPI: enable MWAIT for C1 idle
Add MWAIT idle for C1 state instead of halt, on platforms that support C1 state with MWAIT. Renames cx->space_id to something more appropriate. Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
venkatesh.pallipadi@intel.com · Len Brown
1 parent 2e906655ba
Showing 2 changed files with 14 additions and 9 deletions Side-by-side Diff
drivers/acpi/processor_idle.c
include/acpi/processor.h
@@ -265,7 +265,7 @@
 /* Common C-state entry for C2, C3, .. */
 static void acpi_cstate_enter(struct acpi_processor_cx *cstate)
 {
-	if (cstate->space_id == ACPI_CSTATE_FFH) {
+	if (cstate->entry_method == ACPI_CSTATE_FFH) {
 		/* Call into architectural FFH based C-state */
 		acpi_processor_ffh_cstate_enter(cstate);
 	} else {
  
  
  
@@ -929,20 +929,20 @@
 		cx.address = reg->address;
 		cx.index = current_count + 1;
  
-		cx.space_id = ACPI_CSTATE_SYSTEMIO;
+		cx.entry_method = ACPI_CSTATE_SYSTEMIO;
 		if (reg->space_id == ACPI_ADR_SPACE_FIXED_HARDWARE) {
 			if (acpi_processor_ffh_cstate_probe
 					(pr->id, &cx, reg) == 0) {
-				cx.space_id = ACPI_CSTATE_FFH;
-			} else if (cx.type != ACPI_STATE_C1) {
+				cx.entry_method = ACPI_CSTATE_FFH;
+			} else if (cx.type == ACPI_STATE_C1) {
 				/*
 				 * C1 is a special case where FIXED_HARDWARE
 				 * can be handled in non-MWAIT way as well.
 				 * In that case, save this _CST entry info.
-				 * That is, we retain space_id of SYSTEM_IO for
-				 * halt based C1.
 				 * Otherwise, ignore this info and continue.
 				 */
+				cx.entry_method = ACPI_CSTATE_HALT;
+			} else {
 				continue;
 			}
 		}
  
  
@@ -1376,12 +1376,16 @@
 /**
  * acpi_idle_do_entry - a helper function that does C2 and C3 type entry
  * @cx: cstate data
+ *
+ * Caller disables interrupt before call and enables interrupt after return.
  */
 static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx)
 {
-	if (cx->space_id == ACPI_CSTATE_FFH) {
+	if (cx->entry_method == ACPI_CSTATE_FFH) {
 		/* Call into architectural FFH based C-state */
 		acpi_processor_ffh_cstate_enter(cx);
+	} else if (cx->entry_method == ACPI_CSTATE_HALT) {
+		acpi_safe_halt();
 	} else {
 		int unused;
 		/* IO port based C-state */
@@ -1414,7 +1418,7 @@
 	if (pr->flags.bm_check)
 		acpi_idle_update_bm_rld(pr, cx);
  
-	acpi_safe_halt();
+	acpi_idle_do_entry(cx);
  
 	local_irq_enable();
 	cx->usage++;
@@ -34,6 +34,7 @@
  
 #define ACPI_CSTATE_SYSTEMIO	(0)
 #define ACPI_CSTATE_FFH		(1)
+#define ACPI_CSTATE_HALT	(2)
  
 /* Power Management */
  
@@ -64,7 +65,7 @@
 	u8 valid;
 	u8 type;
 	u32 address;
-	u8 space_id;
+	u8 entry_method;
 	u8 index;
 	u32 latency;
 	u32 latency_ticks;
...	...	@@ -265,7 +265,7 @@
265	265	/* Common C-state entry for C2, C3, .. */
266	266	static void acpi_cstate_enter(struct acpi_processor_cx *cstate)
267	267	{
268		- if (cstate->space_id == ACPI_CSTATE_FFH) {
	268	+ if (cstate->entry_method == ACPI_CSTATE_FFH) {
269	269	/* Call into architectural FFH based C-state */
270	270	acpi_processor_ffh_cstate_enter(cstate);
271	271	} else {
272	272
273	273
274	274
...	...	@@ -929,20 +929,20 @@
929	929	cx.address = reg->address;
930	930	cx.index = current_count + 1;
931	931
932		- cx.space_id = ACPI_CSTATE_SYSTEMIO;
	932	+ cx.entry_method = ACPI_CSTATE_SYSTEMIO;
933	933	if (reg->space_id == ACPI_ADR_SPACE_FIXED_HARDWARE) {
934	934	if (acpi_processor_ffh_cstate_probe
935	935	(pr->id, &cx, reg) == 0) {
936		- cx.space_id = ACPI_CSTATE_FFH;
937		- } else if (cx.type != ACPI_STATE_C1) {
	936	+ cx.entry_method = ACPI_CSTATE_FFH;
	937	+ } else if (cx.type == ACPI_STATE_C1) {
938	938	/*
939	939	* C1 is a special case where FIXED_HARDWARE
940	940	* can be handled in non-MWAIT way as well.
941	941	* In that case, save this _CST entry info.
942		- * That is, we retain space_id of SYSTEM_IO for
943		- * halt based C1.
944	942	* Otherwise, ignore this info and continue.
945	943	*/
	944	+ cx.entry_method = ACPI_CSTATE_HALT;
	945	+ } else {
946	946	continue;
947	947	}
948	948	}
949	949
950	950
...	...	@@ -1376,12 +1376,16 @@
1376	1376	/**
1377	1377	* acpi_idle_do_entry - a helper function that does C2 and C3 type entry
1378	1378	* @cx: cstate data
	1379	+ *
	1380	+ * Caller disables interrupt before call and enables interrupt after return.
1379	1381	*/
1380	1382	static inline void acpi_idle_do_entry(struct acpi_processor_cx *cx)
1381	1383	{
1382		- if (cx->space_id == ACPI_CSTATE_FFH) {
	1384	+ if (cx->entry_method == ACPI_CSTATE_FFH) {
1383	1385	/* Call into architectural FFH based C-state */
1384	1386	acpi_processor_ffh_cstate_enter(cx);
	1387	+ } else if (cx->entry_method == ACPI_CSTATE_HALT) {
	1388	+ acpi_safe_halt();
1385	1389	} else {
1386	1390	int unused;
1387	1391	/* IO port based C-state */
...	...	@@ -1414,7 +1418,7 @@
1414	1418	if (pr->flags.bm_check)
1415	1419	acpi_idle_update_bm_rld(pr, cx);
1416	1420
1417		- acpi_safe_halt();
	1421	+ acpi_idle_do_entry(cx);
1418	1422
1419	1423	local_irq_enable();
1420	1424	cx->usage++;
...	...	@@ -34,6 +34,7 @@
34	34
35	35	#define ACPI_CSTATE_SYSTEMIO (0)
36	36	#define ACPI_CSTATE_FFH (1)
	37	+#define ACPI_CSTATE_HALT (2)
37	38
38	39	/* Power Management */
39	40
...	...	@@ -64,7 +65,7 @@
64	65	u8 valid;
65	66	u8 type;
66	67	u32 address;
67		- u8 space_id;
	68	+ u8 entry_method;
68	69	u8 index;
69	70	u32 latency;
70	71	u32 latency_ticks;