Skip to contentSkip to conversation

ACPI suspend: Execute _WAK with the right argument

PATCH Applied Rafael J. Wysocki 3 participants 7 messages Feb 12, 2008 – Feb 14, 2008 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ACPI suspend: Execute _WAK with the right argument

From: Rafael J. Wysocki <[email protected]>

The _WAK global ACPI control method has to be called with the argument representing the sleep state being exited. Make it happen.

Special thanks to Mirco Tischler <[email protected]> for reporting the problem and debugging.

---
 drivers/acpi/hardware/hwsleep.c |    1 +
 1 file changed, 1 insertion(+)
drivers/acpi/hardware/hwsleep.c +1 -0
Index: linux-2.6/drivers/acpi/hardware/hwsleep.c
===================================================================
@@ -616,6 +616,7 @@ acpi_status acpi_leave_sleep_state(u8 sl
 		return_ACPI_STATUS(status);
 	}
 
+	arg.integer.value = sleep_state;
 	status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
 	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
 		ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
#1 lore raw
Quoted 10 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

The _WAK global ACPI control method has to be called with the argument representing the sleep state being exited. Make it happen.

Special thanks to Mirco Tischler <[email protected]> for reporting the problem and debugging.

ACK. AFAICT this is 2.6.25 material.
Pavel

Quoted 16 lines
---
 drivers/acpi/hardware/hwsleep.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/drivers/acpi/hardware/hwsleep.c
===================================================================

drivers/acpi/hardware/hwsleep.c +1 -0
@@ -616,6 +616,7 @@ acpi_status acpi_leave_sleep_state(u8 sl
 		return_ACPI_STATUS(status);
 	}
 
+	arg.integer.value = sleep_state;
 	status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
 	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
 		ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#2 lore raw
Quoted 6 lines · Pavel Machek
Quoted 5 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

The _WAK global ACPI control method has to be called with the argument representing the sleep state being exited. Make it happen.

Quoted 7 lines
Quoted 5 lines

Special thanks to Mirco Tischler <[email protected]> for reporting the problem and debugging.

ACK. AFAICT this is 2.6.25 material.

Sure, it certainly is. The bug has been breaking suspend on people's boxes already.

Thanks,
Rafael

Quoted 17 lines
Quoted 16 lines
---
 drivers/acpi/hardware/hwsleep.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/drivers/acpi/hardware/hwsleep.c
===================================================================

drivers/acpi/hardware/hwsleep.c +1 -0
@@ -616,6 +616,7 @@ acpi_status acpi_leave_sleep_state(u8 sl
 		return_ACPI_STATUS(status);
 	}
 
+	arg.integer.value = sleep_state;
 	status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
 	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
 		ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
#3 lore raw
In reply to Pavel Machek
Quoted 6 lines · Pavel Machek
Quoted 5 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

The _WAK global ACPI control method has to be called with the argument representing the sleep state being exited. Make it happen.

Quoted 7 lines
Quoted 5 lines

Special thanks to Mirco Tischler <[email protected]> for reporting the problem and debugging.

ACK. AFAICT this is 2.6.25 material.

Sure, it certainly is. The bug has been breaking suspend on people's boxes already.

Thanks,
Rafael

Quoted 17 lines
Quoted 16 lines
---
 drivers/acpi/hardware/hwsleep.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/drivers/acpi/hardware/hwsleep.c
===================================================================

drivers/acpi/hardware/hwsleep.c +1 -0
@@ -616,6 +616,7 @@ acpi_status acpi_leave_sleep_state(u8 sl
 		return_ACPI_STATUS(status);
 	}
 
+	arg.integer.value = sleep_state;
 	status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
 	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
 		ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
#4 lore raw
In reply to Rafael J. Wysocki
Quoted 10 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

The _WAK global ACPI control method has to be called with the argument representing the sleep state being exited. Make it happen.

Special thanks to Mirco Tischler <[email protected]> for reporting the problem and debugging.

ACK. AFAICT this is 2.6.25 material.
Pavel

Quoted 16 lines
---
 drivers/acpi/hardware/hwsleep.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/drivers/acpi/hardware/hwsleep.c
===================================================================

drivers/acpi/hardware/hwsleep.c +1 -0
@@ -616,6 +616,7 @@ acpi_status acpi_leave_sleep_state(u8 sl
 		return_ACPI_STATUS(status);
 	}
 
+	arg.integer.value = sleep_state;
 	status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
 	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
 		ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
reviewer Applied
#5 lore raw
In reply to Rafael J. Wysocki

applied

thanks for quickly finding and fixing this 2.6.25-rc1 regression.

-len

Quoted 32 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

The _WAK global ACPI control method has to be called with the argument representing the sleep state being exited. Make it happen.

Special thanks to Mirco Tischler <[email protected]> for reporting the problem and debugging.

---
 drivers/acpi/hardware/hwsleep.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/drivers/acpi/hardware/hwsleep.c
===================================================================

drivers/acpi/hardware/hwsleep.c +1 -1
@@ -616,6 +616,7 @@ acpi_status acpi_leave_sleep_state(u8 sl
 		return_ACPI_STATUS(status);
 	}
 
+	arg.integer.value = sleep_state;
 	status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
 	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
 		ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

reviewer Applied
#6 lore raw
In reply to Rafael J. Wysocki

applied

thanks for quickly finding and fixing this 2.6.25-rc1 regression.

-len

Quoted 32 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

The _WAK global ACPI control method has to be called with the argument representing the sleep state being exited. Make it happen.

Special thanks to Mirco Tischler <[email protected]> for reporting the problem and debugging.

---
 drivers/acpi/hardware/hwsleep.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6/drivers/acpi/hardware/hwsleep.c
===================================================================

drivers/acpi/hardware/hwsleep.c +1 -1
@@ -616,6 +616,7 @@ acpi_status acpi_leave_sleep_state(u8 sl
 		return_ACPI_STATUS(status);
 	}
 
+	arg.integer.value = sleep_state;
 	status = acpi_evaluate_object(NULL, METHOD_NAME__WAK, &arg_list, NULL);
 	if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
 		ACPI_EXCEPTION((AE_INFO, status, "During Method _WAK"));
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/