Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10691
-gerrit
commit 59eab300443f693996f6f2e33ea3a21dcd7e56c7 Author: Patrick Georgi pgeorgi@google.com Date: Thu May 28 11:59:33 2015 +0200
Expose get_lid_switch() in romstage
The function was used locally and in ramstage to set some coreboot tables. It's also needed in romstage to deal with "lid closed" behaviour.
BRANCH=none BUG=chromium:446945 TEST=none
Change-Id: I8ad7061328c45803699321aa9f5edb0ed2288a8d Signed-off-by: Patrick Georgi pgeorgi@chromium.org Original-Commit-Id: 78281a104fb9d79696a6ceb2a9a89a391146a424 Original-Change-Id: I56314b9dc9062dd61671982e7ec0ff15d7eb1bae Original-Signed-off-by: Patrick Georgi pgeorgi@google.com Original-Reviewed-on: https://chromium-review.googlesource.com/273609 Original-Reviewed-by: Stefan Reinauer reinauer@chromium.org Original-Tested-by: Patrick Georgi pgeorgi@chromium.org Original-Commit-Queue: Patrick Georgi pgeorgi@chromium.org --- src/include/bootmode.h | 1 + src/mainboard/google/auron/chromeos.c | 14 +++++++------- src/mainboard/google/bolt/chromeos.c | 22 +++++++++++----------- src/mainboard/google/falco/chromeos.c | 22 +++++++++++----------- src/mainboard/google/link/chromeos.c | 14 +++++++------- src/mainboard/google/peppy/chromeos.c | 22 +++++++++++----------- src/mainboard/google/rambi/chromeos.c | 24 ++++++++++++------------ src/mainboard/google/samus/chromeos.c | 14 +++++++------- src/mainboard/google/slippy/chromeos.c | 22 +++++++++++----------- 9 files changed, 78 insertions(+), 77 deletions(-)
diff --git a/src/include/bootmode.h b/src/include/bootmode.h index da4e070..ff562d5 100644 --- a/src/include/bootmode.h +++ b/src/include/bootmode.h @@ -27,6 +27,7 @@ int get_developer_mode_switch(void); int get_recovery_mode_switch(void); int clear_recovery_mode_switch(void); int get_wipeout_mode_switch(void); +int get_lid_switch(void);
int gfx_get_init_done(void); diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c index a5e2aea..38bb8d9 100644 --- a/src/mainboard/google/auron/chromeos.c +++ b/src/mainboard/google/auron/chromeos.c @@ -35,13 +35,6 @@
#define GPIO_COUNT 6
-static int get_lid_switch(void) -{ - u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); - - return !!(ec_switches & EC_SWITCH_LID_OPEN); -} - /*static void fill_lb_gpio(struct lb_gpio *gpio, int num, int polarity, const char *name, int force) { @@ -75,6 +68,13 @@ void fill_lb_gpios(struct lb_gpios *gpios) } #endif
+int get_lid_switch(void) +{ + u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); + + return !!(ec_switches & EC_SWITCH_LID_OPEN); +} + /* The dev-switch is virtual */ int get_developer_mode_switch(void) { diff --git a/src/mainboard/google/bolt/chromeos.c b/src/mainboard/google/bolt/chromeos.c index 02a6ee6..6ccb154 100644 --- a/src/mainboard/google/bolt/chromeos.c +++ b/src/mainboard/google/bolt/chromeos.c @@ -37,17 +37,6 @@
#define GPIO_COUNT 6
-static int get_lid_switch(void) -{ -#if CONFIG_EC_GOOGLE_CHROMEEC - u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); - - return !!(ec_switches & EC_SWITCH_LID_OPEN); -#else - return 0; -#endif -} - void fill_lb_gpios(struct lb_gpios *gpios) { struct lb_gpio *gpio; @@ -68,6 +57,17 @@ void fill_lb_gpios(struct lb_gpios *gpios) } #endif
+int get_lid_switch(void) +{ +#if CONFIG_EC_GOOGLE_CHROMEEC + u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); + + return !!(ec_switches & EC_SWITCH_LID_OPEN); +#else + return 0; +#endif +} + /* The dev-switch is virtual */ int get_developer_mode_switch(void) { diff --git a/src/mainboard/google/falco/chromeos.c b/src/mainboard/google/falco/chromeos.c index ef10c48..cd2728e 100644 --- a/src/mainboard/google/falco/chromeos.c +++ b/src/mainboard/google/falco/chromeos.c @@ -34,17 +34,6 @@
#define GPIO_COUNT 6
-static int get_lid_switch(void) -{ -#if CONFIG_EC_GOOGLE_CHROMEEC - u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); - - return !!(ec_switches & EC_SWITCH_LID_OPEN); -#else - return 0; -#endif -} - void fill_lb_gpios(struct lb_gpios *gpios) { struct lb_gpio *gpio; @@ -65,6 +54,17 @@ void fill_lb_gpios(struct lb_gpios *gpios) } #endif
+int get_lid_switch(void) +{ +#if CONFIG_EC_GOOGLE_CHROMEEC + u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); + + return !!(ec_switches & EC_SWITCH_LID_OPEN); +#else + return 0; +#endif +} + /* The dev-switch is virtual */ int get_developer_mode_switch(void) { diff --git a/src/mainboard/google/link/chromeos.c b/src/mainboard/google/link/chromeos.c index 7a6b3a2..a020b06 100644 --- a/src/mainboard/google/link/chromeos.c +++ b/src/mainboard/google/link/chromeos.c @@ -31,13 +31,6 @@
#define GPIO_COUNT 6
-static int get_lid_switch(void) -{ - u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); - - return !!(ec_switches & EC_SWITCH_LID_OPEN); -} - void fill_lb_gpios(struct lb_gpios *gpios) { device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0)); @@ -91,6 +84,13 @@ void fill_lb_gpios(struct lb_gpios *gpios) } #endif
+int get_lid_switch(void) +{ + u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); + + return !!(ec_switches & EC_SWITCH_LID_OPEN); +} + /* The dev-switch is virtual on Link (and so handled elsewhere). */ int get_developer_mode_switch(void) { diff --git a/src/mainboard/google/peppy/chromeos.c b/src/mainboard/google/peppy/chromeos.c index ef10c48..cd2728e 100644 --- a/src/mainboard/google/peppy/chromeos.c +++ b/src/mainboard/google/peppy/chromeos.c @@ -34,17 +34,6 @@
#define GPIO_COUNT 6
-static int get_lid_switch(void) -{ -#if CONFIG_EC_GOOGLE_CHROMEEC - u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); - - return !!(ec_switches & EC_SWITCH_LID_OPEN); -#else - return 0; -#endif -} - void fill_lb_gpios(struct lb_gpios *gpios) { struct lb_gpio *gpio; @@ -65,6 +54,17 @@ void fill_lb_gpios(struct lb_gpios *gpios) } #endif
+int get_lid_switch(void) +{ +#if CONFIG_EC_GOOGLE_CHROMEEC + u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); + + return !!(ec_switches & EC_SWITCH_LID_OPEN); +#else + return 0; +#endif +} + /* The dev-switch is virtual */ int get_developer_mode_switch(void) { diff --git a/src/mainboard/google/rambi/chromeos.c b/src/mainboard/google/rambi/chromeos.c index c363161..3e07044 100644 --- a/src/mainboard/google/rambi/chromeos.c +++ b/src/mainboard/google/rambi/chromeos.c @@ -37,18 +37,6 @@
#define GPIO_COUNT 6
-static int get_lid_switch(void) -{ -#if CONFIG_EC_GOOGLE_CHROMEEC - u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); - - return !!(ec_switches & EC_SWITCH_LID_OPEN); -#else - /* Default to force open. */ - return 1; -#endif -} - void fill_lb_gpios(struct lb_gpios *gpios) { struct lb_gpio *gpio; @@ -69,6 +57,18 @@ void fill_lb_gpios(struct lb_gpios *gpios) } #endif
+int get_lid_switch(void) +{ +#if CONFIG_EC_GOOGLE_CHROMEEC + u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); + + return !!(ec_switches & EC_SWITCH_LID_OPEN); +#else + /* Default to force open. */ + return 1; +#endif +} + int get_developer_mode_switch(void) { return 0; diff --git a/src/mainboard/google/samus/chromeos.c b/src/mainboard/google/samus/chromeos.c index e3a9f4a..dc28ed1 100644 --- a/src/mainboard/google/samus/chromeos.c +++ b/src/mainboard/google/samus/chromeos.c @@ -37,13 +37,6 @@
#define GPIO_COUNT 6
-static int get_lid_switch(void) -{ - u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); - - return !!(ec_switches & EC_SWITCH_LID_OPEN); -} - void fill_lb_gpios(struct lb_gpios *gpios) { struct lb_gpio *gpio; @@ -64,6 +57,13 @@ void fill_lb_gpios(struct lb_gpios *gpios) } #endif
+int get_lid_switch(void) +{ + u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); + + return !!(ec_switches & EC_SWITCH_LID_OPEN); +} + /* The dev-switch is virtual */ int get_developer_mode_switch(void) { diff --git a/src/mainboard/google/slippy/chromeos.c b/src/mainboard/google/slippy/chromeos.c index ef10c48..cd2728e 100644 --- a/src/mainboard/google/slippy/chromeos.c +++ b/src/mainboard/google/slippy/chromeos.c @@ -34,17 +34,6 @@
#define GPIO_COUNT 6
-static int get_lid_switch(void) -{ -#if CONFIG_EC_GOOGLE_CHROMEEC - u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); - - return !!(ec_switches & EC_SWITCH_LID_OPEN); -#else - return 0; -#endif -} - void fill_lb_gpios(struct lb_gpios *gpios) { struct lb_gpio *gpio; @@ -65,6 +54,17 @@ void fill_lb_gpios(struct lb_gpios *gpios) } #endif
+int get_lid_switch(void) +{ +#if CONFIG_EC_GOOGLE_CHROMEEC + u8 ec_switches = inb(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); + + return !!(ec_switches & EC_SWITCH_LID_OPEN); +#else + return 0; +#endif +} + /* The dev-switch is virtual */ int get_developer_mode_switch(void) {
-
Patrick Georgi