[PATCH] ACPI / WAKEUP : enable wakeup power for physical child devices

[Andrey Skvortsov]

commit f2b56bc808addb908a5bf435d9b942c02af9a7c4
("ACPI / PM: Use device wakeup flags for handling ACPI wakeup devices")
broke wake-on-lan for Broadcom BCM4401 Ethernet card (b44) on Dell Vostro 1500 laptop.
device_may_wakeup for main ACPI device (PCIE) returns false, because it has
can_wakeup = 0. Therefore any physical devices connected to this parent
were not prepared for wakeup/suspend. But physical device is capable to
wakeup the system.

To fix this issue device_may_wakeup was replaced with acpi_device_may_wakeup.
acpi_device_may_wakeup was written based on function
acpi_system_wakeup_device_seq_show

Signed-off-by: Andrey Skvortsov <Andrej.Skvortzov@xxxxxxxxx>
---
 drivers/acpi/wakeup.c |   45 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index 1638401..0da7e70 100644
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -19,6 +19,34 @@
 #define _COMPONENT		ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("wakeup_devices")
 
+
+bool acpi_device_may_wakeup(struct acpi_device *dev)
+{
+	struct acpi_device_physical_node *entry;
+	bool may_wakeup = false;
+
+	mutex_lock(&dev->physical_node_lock);
+	if (!dev->physical_node_count)
+		may_wakeup = device_may_wakeup(&dev->dev);
+	else {
+		struct device *ldev;
+
+		list_for_each_entry(entry, &dev->physical_node_list, node) {
+			ldev = get_device(entry->dev);
+			if (!ldev)
+				continue;
+
+			may_wakeup = device_may_wakeup(&dev->dev) ||
+				device_may_wakeup(ldev);
+
+			put_device(ldev);
+		}
+	}
+
+	mutex_unlock(&dev->physical_node_lock);
+	return may_wakeup;
+}
+
 /**
  * acpi_enable_wakeup_devices - Enable wake-up device GPEs.
  * @sleep_state: ACPI system sleep state.
@@ -35,13 +63,14 @@ void acpi_enable_wakeup_devices(u8 sleep_state)
 		struct acpi_device *dev =
 			container_of(node, struct acpi_device, wakeup_list);
 
+
 		if (!dev->wakeup.flags.valid
-		    || sleep_state > (u32) dev->wakeup.sleep_state
-		    || !(device_may_wakeup(&dev->dev)
-		        || dev->wakeup.prepare_count))
+			|| sleep_state > (u32) dev->wakeup.sleep_state
+			|| !(acpi_device_may_wakeup(dev)
+			    || dev->wakeup.prepare_count))
 			continue;
 
-		if (device_may_wakeup(&dev->dev))
+		if (acpi_device_may_wakeup(dev))
 			acpi_enable_wakeup_device_power(dev, sleep_state);
 
 		/* The wake-up power should have been enabled already. */
@@ -63,15 +92,15 @@ void acpi_disable_wakeup_devices(u8 sleep_state)
 			container_of(node, struct acpi_device, wakeup_list);
 
 		if (!dev->wakeup.flags.valid
-		    || sleep_state > (u32) dev->wakeup.sleep_state
-		    || !(device_may_wakeup(&dev->dev)
-		        || dev->wakeup.prepare_count))
+			|| sleep_state > (u32) dev->wakeup.sleep_state
+			|| !(acpi_device_may_wakeup(dev)
+				|| dev->wakeup.prepare_count))
 			continue;
 
 		acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
 				ACPI_GPE_DISABLE);
 
-		if (device_may_wakeup(&dev->dev))
+		if (acpi_device_may_wakeup(dev))
 			acpi_disable_wakeup_device_power(dev);
 	}
 }
-- 
1.7.2.5

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