sravan/system76-embedded-controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable WLAN at power_on() instead of board_init()

Browse Source 
If the board is on AC power when powered off the EC will not reset, and
WLAN power will not be enabled on next boot. Move enabling WLAN from
`board_init()` to `power_on()`.

Fixes: be4659a0cb ("Set wireless power at init and power off")
Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
2022-11-18 14:13:12 -07:00
committed by Tim Crawford
parent be4659a0cb
commit 2a8befc195
23 changed files with 6 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/board/system76/addw1/board.c
View File

@@ -4,7 +4,6 @@
#include <board/gpio.h> #include <board/gpio.h>
#include <board/kbc.h> #include <board/kbc.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
extern uint8_t main_cycle; extern uint8_t main_cycle;
@@ -22,8 +21,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/addw2/board.c
View File

@@ -5,7 +5,6 @@
#include <board/gpio.h> #include <board/gpio.h>
#include <board/kbc.h> #include <board/kbc.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -20,8 +19,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/bonw14/board.c
View File

@@ -4,7 +4,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -21,8 +20,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

8
src/board/system76/common/power.c
View File

@@ -182,6 +182,9 @@ void power_init(void) {
} }
void power_on(void) { void power_on(void) {
// Configure WLAN GPIOs before powering on
wireless_power(true);
DEBUG("%02X: power_on\n", main_cycle); DEBUG("%02X: power_on\n", main_cycle);
// See Figure 12-19 in Whiskey Lake Platform Design Guide // See Figure 12-19 in Whiskey Lake Platform Design Guide
@@ -258,8 +261,6 @@ void power_on(void) {
void power_off(void) { void power_off(void) {
DEBUG("%02X: power_off\n", main_cycle); DEBUG("%02X: power_off\n", main_cycle);
wireless_power(false);
#if HAVE_PCH_PWROK_EC #if HAVE_PCH_PWROK_EC
// De-assert SYS_PWROK // De-assert SYS_PWROK
GPIO_SET_DEBUG(PCH_PWROK_EC, false); GPIO_SET_DEBUG(PCH_PWROK_EC, false);
@@ -296,6 +297,9 @@ void power_off(void) {
#endif // HAVE_PCH_DPWROK_EC #endif // HAVE_PCH_DPWROK_EC
tPCH14; tPCH14;
// Configure WLAN GPIOs after powering off
wireless_power(false);
update_power_state(); update_power_state();
} }

3
src/board/system76/darp5/board.c
View File

@@ -2,7 +2,6 @@
#include <board/board.h> #include <board/board.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/wireless.h>
void board_init(void) { void board_init(void) {
// Allow CPU to boot // Allow CPU to boot
@@ -17,8 +16,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) {} void board_event(void) {}

3
src/board/system76/darp7/board.c
View File

@@ -4,7 +4,6 @@
#include <board/espi.h> #include <board/espi.h>
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -22,8 +21,6 @@ void board_init(void) {
// Assert SMI# and SWI# // Assert SMI# and SWI#
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/darp8/board.c
View File

@@ -4,7 +4,6 @@
#include <board/board.h> #include <board/board.h>
#include <board/espi.h> #include <board/espi.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/wireless.h>
#include <ec/ec.h> #include <ec/ec.h>
void board_init(void) { void board_init(void) {
@@ -22,8 +21,6 @@ void board_init(void) {
// Assert SMI# and SWI# // Assert SMI# and SWI#
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/galp3-c/board.c
View File

@@ -2,7 +2,6 @@
#include <board/board.h> #include <board/board.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/wireless.h>
void board_init(void) { void board_init(void) {
// Allow CPU to boot // Allow CPU to boot
@@ -17,8 +16,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) {} void board_event(void) {}

3
src/board/system76/galp5/board.c
View File

@@ -6,7 +6,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -27,8 +26,6 @@ void board_init(void) {
// Assert SMI# and SWI# // Assert SMI# and SWI#
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/galp6/board.c
View File

@@ -4,7 +4,6 @@
#include <board/board.h> #include <board/board.h>
#include <board/espi.h> #include <board/espi.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/wireless.h>
#include <ec/ec.h> #include <ec/ec.h>
void board_init(void) { void board_init(void) {
@@ -18,8 +17,6 @@ void board_init(void) {
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
// Make sure charger is in off state, also enables PSYS // Make sure charger is in off state, also enables PSYS
battery_charger_disable(); battery_charger_disable();
} }

3
src/board/system76/gaze15/board.c
View File

@@ -4,7 +4,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -17,8 +16,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/gaze16-3050/board.c
View File

@@ -6,7 +6,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -20,8 +19,6 @@ void board_init(void) {
gpio_set(&BKL_EN, true); gpio_set(&BKL_EN, true);
// Enable camera // Enable camera
gpio_set(&CCD_EN, true); gpio_set(&CCD_EN, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/gaze16-3060/board.c
View File

@@ -6,7 +6,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -20,8 +19,6 @@ void board_init(void) {
gpio_set(&BKL_EN, true); gpio_set(&BKL_EN, true);
// Enable camera // Enable camera
gpio_set(&CCD_EN, true); gpio_set(&CCD_EN, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/gaze17-3050/board.c
View File

@@ -6,7 +6,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -20,8 +19,6 @@ void board_init(void) {
gpio_set(&BKL_EN, true); gpio_set(&BKL_EN, true);
// Enable camera // Enable camera
gpio_set(&CCD_EN, true); gpio_set(&CCD_EN, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/gaze17-3060/board.c
View File

@@ -6,7 +6,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -20,8 +19,6 @@ void board_init(void) {
gpio_set(&BKL_EN, true); gpio_set(&BKL_EN, true);
// Enable camera // Enable camera
gpio_set(&CCD_EN, true); gpio_set(&CCD_EN, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/lemp10/board.c
View File

@@ -4,7 +4,6 @@
#include <board/espi.h> #include <board/espi.h>
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -23,8 +22,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/lemp11/board.c
View File

@@ -4,7 +4,6 @@
#include <board/board.h> #include <board/board.h>
#include <board/espi.h> #include <board/espi.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/wireless.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -24,8 +23,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/lemp9/board.c
View File

@@ -2,7 +2,6 @@
#include <board/board.h> #include <board/board.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/wireless.h>
void board_init(void) { void board_init(void) {
// Allow CPU to boot // Allow CPU to boot
@@ -17,8 +16,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_on_ac(bool ac) { /* Fix unused variable */ ac = ac; } void board_on_ac(bool ac) { /* Fix unused variable */ ac = ac; }

3
src/board/system76/oryp5/board.c
View File

@@ -3,7 +3,6 @@
#include <board/board.h> #include <board/board.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
void board_init(void) { void board_init(void) {
@@ -19,8 +18,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/oryp6/board.c
View File

@@ -4,7 +4,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -21,8 +20,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/oryp7/board.c
View File

@@ -4,7 +4,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -21,8 +20,6 @@ void board_init(void) {
gpio_set(&SCI_N, true); gpio_set(&SCI_N, true);
gpio_set(&SMI_N, true); gpio_set(&SMI_N, true);
gpio_set(&SWI_N, true); gpio_set(&SWI_N, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/oryp8/board.c
View File

@@ -5,7 +5,6 @@
#include <board/gctrl.h> #include <board/gctrl.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/power.h> #include <board/power.h>
#include <board/wireless.h>
#include <common/debug.h> #include <common/debug.h>
#include <ec/ec.h> #include <ec/ec.h>
@@ -16,8 +15,6 @@ void board_init(void) {
gpio_set(&BKL_EN, true); gpio_set(&BKL_EN, true);
// Enable camera // Enable camera
gpio_set(&CCD_EN, true); gpio_set(&CCD_EN, true);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {

3
src/board/system76/oryp9/board.c
View File

@@ -4,7 +4,6 @@
#include <board/board.h> #include <board/board.h>
#include <board/espi.h> #include <board/espi.h>
#include <board/gpio.h> #include <board/gpio.h>
#include <board/wireless.h>
#include <ec/ec.h> #include <ec/ec.h>
void board_init(void) { void board_init(void) {
@@ -19,8 +18,6 @@ void board_init(void) {
gpio_set(&CCD_EN, true); gpio_set(&CCD_EN, true);
// Enable USB port power // Enable USB port power
gpio_set(&USB_PWR_EN_N, false); gpio_set(&USB_PWR_EN_N, false);
wireless_power(true);
} }
void board_event(void) { void board_event(void) {