Allow AP to set wireless power state in suspend

Previously, the AP could only set the current wireless power state.
It couldn't determine what the EC would do in S3, nor could it get the
current wireless power state.  Extend the wireless command to do so,
and add an EC console command to aid in debugging.

BUG=chrome-os-partner:25655
BRANCH=rambi
TEST=manual; expected numbers are from EC 'wireless' command
  AP off -> 0x0, 0x9
  AP on -> 0xd 0x9
  AP suspended -> 0x9 0x9
  AP on -> 0xd 0x9
  ectool wireless 0x1 -> 0x1 0x9
  ectool wireless 0xd -> 0xd 0x9
  ectool wireless 0 0 0 0 -> 0xd 0x9 (and prints 0xd 0x9 to root shell)
  ectool wireless 5 -1 -1 0 -> 0x5 0x9
  AP suspended -> 0x1 0x9 (doesn't turn on 0x8, just turns off 0x4)
  AP on -> 0xd 0x9
  ectool wireless 0 0 0 -1 -> 0xd 0x0
  AP suspended -> 0x0 0x0
  AP on -> 0xd 0x9

Change-Id: I8ead2d4a4423b51ec4f638bf94c62de98726b25c
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/187273

3 files changed, 21 insertions, 21 deletions

diff --git a/power/baytrail.c b/power/baytrail.c
index 2d4aba1a36..b44e1b8e27 100644
--- a/power/baytrail.c
+++ b/power/baytrail.c
@@ -129,7 +129,7 @@ enum power_state power_chipset_init(void)
 			gpio_set_level(GPIO_PP5000_EN, 0);
 			gpio_set_level(GPIO_PCH_RSMRST_L, 0);
 			gpio_set_level(GPIO_PCH_SYS_PWROK, 0);
-			wireless_enable(0);
+			wireless_set_state(WIRELESS_OFF);
 		}
 	}
 
@@ -233,7 +233,7 @@ enum power_state power_handle_state(enum power_state state)
 		gpio_set_level(GPIO_PP3300_DX_EN, 1);
 
 		/* Enable wireless */
-		wireless_enable(EC_WIRELESS_SWITCH_ALL);
+		wireless_set_state(WIRELESS_ON);
 
 		/*
 		 * Make sure touchscreen is out if reset (even if the lid is
@@ -245,7 +245,7 @@ enum power_state power_handle_state(enum power_state state)
 		/* Wait for non-core power rails good */
 		if (power_wait_signals(IN_PGOOD_S0)) {
 			chipset_force_shutdown();
-			wireless_enable(0);
+			wireless_set_state(WIRELESS_OFF);
 			gpio_set_level(GPIO_PP3300_DX_EN, 0);
 			gpio_set_level(GPIO_PP5000_EN, 0);
 			gpio_set_level(GPIO_TOUCHSCREEN_RESET_L, 0);
@@ -298,14 +298,8 @@ enum power_state power_handle_state(enum power_state state)
 		/* Disable +CPU_CORE */
 		gpio_set_level(GPIO_VCORE_EN, 0);
 
-#ifdef CONFIG_WIRELESS_SUSPEND_ENABLE_WIFI
-		/* Disable WWAN, but leave WiFi on */
-		wireless_enable(EC_WIRELESS_SWITCH_WLAN |
-				EC_WIRELESS_SWITCH_WLAN_POWER);
-#else
-		/* Disable wireless */
-		wireless_enable(0);
-#endif
+		/* Suspend wireless */
+		wireless_set_state(WIRELESS_SUSPEND);
 
 		/*
 		 * Enable idle task deep sleep. Allow the low power idle task
@@ -343,7 +337,7 @@ enum power_state power_handle_state(enum power_state state)
 		gpio_set_level(GPIO_PP5000_EN, 0);
 
 		/* Disable wireless */
-		wireless_enable(0);
+		wireless_set_state(WIRELESS_OFF);
 
 		/* Disable touchpad power and hold touchscreen in reset */
 		gpio_set_level(GPIO_ENABLE_TOUCHPAD, 0);
diff --git a/power/haswell.c b/power/haswell.c
index b51ac36ad8..b5250379ad 100644
--- a/power/haswell.c
+++ b/power/haswell.c
@@ -145,7 +145,7 @@ enum power_state power_chipset_init(void)
 			gpio_set_level(GPIO_PP5000_EN, 0);
 			gpio_set_level(GPIO_PCH_RSMRST_L, 0);
 			gpio_set_level(GPIO_PCH_DPWROK, 0);
-			wireless_enable(0);
+			wireless_set_state(WIRELESS_OFF);
 		}
 	}
 
@@ -261,7 +261,7 @@ enum power_state power_handle_state(enum power_state state)
 		gpio_set_level(GPIO_PP3300_DX_EN, 1);
 
 		/* Enable wireless */
-		wireless_enable(EC_WIRELESS_SWITCH_ALL);
+		wireless_set_state(WIRELESS_ON);
 
 		/*
 		 * Make sure touchscreen is out if reset (even if the lid is
@@ -273,7 +273,7 @@ enum power_state power_handle_state(enum power_state state)
 		/* Wait for non-core power rails good */
 		if (power_wait_signals(IN_PGOOD_S0)) {
 			chipset_force_shutdown();
-			wireless_enable(0);
+			wireless_set_state(WIRELESS_OFF);
 			gpio_set_level(GPIO_EC_EDP_VDD_EN, 0);
 			gpio_set_level(GPIO_PP3300_DX_EN, 0);
 			gpio_set_level(GPIO_TOUCHSCREEN_RESET_L, 0);
@@ -323,8 +323,8 @@ enum power_state power_handle_state(enum power_state state)
 		/* Disable +CPU_CORE */
 		gpio_set_level(GPIO_VCORE_EN, 0);
 
-		/* Disable wireless */
-		wireless_enable(0);
+		/* Suspend wireless */
+		wireless_set_state(WIRELESS_SUSPEND);
 
 		/*
 		 * Enable idle task deep sleep. Allow the low power idle task
@@ -347,6 +347,9 @@ enum power_state power_handle_state(enum power_state state)
 		/* Call hooks before we remove power rails */
 		hook_notify(HOOK_CHIPSET_SHUTDOWN);
 
+		/* Disable wireless */
+		wireless_set_state(WIRELESS_OFF);
+
 		/* Disable touchpad power */
 		gpio_set_level(GPIO_ENABLE_TOUCHPAD, 0);
 
diff --git a/power/ivybridge.c b/power/ivybridge.c
index 587960bea8..10086a862a 100644
--- a/power/ivybridge.c
+++ b/power/ivybridge.c
@@ -239,7 +239,7 @@ enum power_state power_handle_state(enum power_state state)
 		gpio_set_level(GPIO_ENABLE_VS, 1);
 
 		/* Enable wireless */
-		wireless_enable(EC_WIRELESS_SWITCH_ALL);
+		wireless_set_state(WIRELESS_ON);
 
 		/*
 		 * Make sure touchscreen is out if reset (even if the lid is
@@ -252,7 +252,7 @@ enum power_state power_handle_state(enum power_state state)
 		if (power_wait_signals(IN_PGOOD_S0)) {
 			chipset_force_shutdown();
 			gpio_set_level(GPIO_TOUCHSCREEN_RESET_L, 0);
-			wireless_enable(0);
+			wireless_set_state(WIRELESS_OFF);
 			gpio_set_level(GPIO_ENABLE_VS, 0);
 			return POWER_S3;
 		}
@@ -292,8 +292,8 @@ enum power_state power_handle_state(enum power_state state)
 		/* Disable +CPU_CORE and +VGFX_CORE */
 		gpio_set_level(GPIO_ENABLE_VCORE, 0);
 
-		/* Disable wireless */
-		wireless_enable(0);
+		/* Suspend wireless */
+		wireless_set_state(WIRELESS_SUSPEND);
 
 		/*
 		 * Deassert prochot since CPU is off and we're about to drop
@@ -309,6 +309,9 @@ enum power_state power_handle_state(enum power_state state)
 		/* Call hooks before we remove power rails */
 		hook_notify(HOOK_CHIPSET_SHUTDOWN);
 
+		/* Disable wireless */
+		wireless_set_state(WIRELESS_OFF);
+
 		/* Disable touchpad power */
 		gpio_set_level(GPIO_ENABLE_TOUCHPAD, 0);