diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-02-18 06:26:52 +0200 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2021-04-30 06:48:56 +0000 |
commit | bc441c72ce7739a5a4ef647e3331afe5fbddc86e (patch) | |
tree | 079a4ede1734eda931d6857ccea5d285b5fb60a6 /src | |
parent | 8a1fcf475401f32208c48376205a443a3acbf5c1 (diff) |
mb/google: Move ECFW_RW setting for non-ChromeEC boards
The boolean is stored in ChromeOS NVS, not GNVS.
Change-Id: I5c424a052d484228a456f8f0ad4fb0bed3165e09
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50877
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/include/acpi/acpi_gnvs.h | 2 | ||||
-rw-r--r-- | src/mainboard/google/butterfly/acpi_tables.c | 7 | ||||
-rw-r--r-- | src/mainboard/google/butterfly/chromeos.c | 7 | ||||
-rw-r--r-- | src/mainboard/google/parrot/acpi_tables.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/parrot/chromeos.c | 5 | ||||
-rw-r--r-- | src/mainboard/google/parrot/ec.h | 1 | ||||
-rw-r--r-- | src/mainboard/google/stout/acpi_tables.c | 7 | ||||
-rw-r--r-- | src/mainboard/google/stout/chromeos.c | 3 | ||||
-rw-r--r-- | src/mainboard/samsung/lumpy/acpi_tables.c | 4 | ||||
-rw-r--r-- | src/mainboard/samsung/lumpy/chromeos.c | 3 | ||||
-rw-r--r-- | src/vendorcode/google/chromeos/chromeos.h | 1 | ||||
-rw-r--r-- | src/vendorcode/google/chromeos/gnvs.c | 2 |
12 files changed, 19 insertions, 27 deletions
diff --git a/src/include/acpi/acpi_gnvs.h b/src/include/acpi/acpi_gnvs.h index f24f5ef5ce..976726a9fe 100644 --- a/src/include/acpi/acpi_gnvs.h +++ b/src/include/acpi/acpi_gnvs.h @@ -17,8 +17,6 @@ static inline void *acpi_get_gnvs(void) { return NULL; } static inline int acpi_reset_gnvs_for_wake(struct global_nvs **gnvs) { return -1; } #endif -void gnvs_set_ecfw_rw(void); - /* * These functions populate the gnvs structure in acpi table. * Defined as weak in common acpi as gnvs structure definition is diff --git a/src/mainboard/google/butterfly/acpi_tables.c b/src/mainboard/google/butterfly/acpi_tables.c index c3324aac5e..aa02f67be5 100644 --- a/src/mainboard/google/butterfly/acpi_tables.c +++ b/src/mainboard/google/butterfly/acpi_tables.c @@ -14,13 +14,6 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->s5u0 = 0; gnvs->s5u1 = 0; - // TODO: MLR - // The firmware read/write status is a "virtual" switch and - // will be handled elsewhere. Until then hard-code to - // read/write instead of read-only for developer mode. - if (CONFIG(CHROMEOS_NVS)) - gnvs_set_ecfw_rw(); - // the lid is open by default. gnvs->lids = 1; diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c index c4eb66ab64..356e97b7b5 100644 --- a/src/mainboard/google/butterfly/chromeos.c +++ b/src/mainboard/google/butterfly/chromeos.c @@ -68,5 +68,12 @@ static const struct cros_gpio cros_gpios[] = { void mainboard_chromeos_acpi_generate(void) { + // TODO: MLR + // The firmware read/write status is a "virtual" switch and + // will be handled elsewhere. Until then hard-code to + // read/write instead of read-only for developer mode. + if (CONFIG(CHROMEOS_NVS)) + chromeos_set_ecfw_rw(); + chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios)); } diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c index 535edb8d36..0c7120de75 100644 --- a/src/mainboard/google/parrot/acpi_tables.c +++ b/src/mainboard/google/parrot/acpi_tables.c @@ -3,7 +3,6 @@ #include <acpi/acpi.h> #include <acpi/acpi_gnvs.h> #include <device/device.h> -#include <ec/compal/ene932/ec.h> #include "ec.h" #include <southbridge/intel/bd82x6x/pch.h> @@ -21,9 +20,6 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->s5u0 = 0; gnvs->s5u1 = 0; - if (CONFIG(CHROMEOS_NVS) && !parrot_ec_running_ro()) - gnvs_set_ecfw_rw(); - /* EC handles all active thermal and fan control on Parrot. */ gnvs->tcrt = CRITICAL_TEMPERATURE; gnvs->tpsv = PASSIVE_TEMPERATURE; diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c index 93ed0674d7..03b0d476f3 100644 --- a/src/mainboard/google/parrot/chromeos.c +++ b/src/mainboard/google/parrot/chromeos.c @@ -51,7 +51,7 @@ int get_recovery_mode_switch(void) return gpio; } -int parrot_ec_running_ro(void) +static int parrot_ec_running_ro(void) { return !get_gpio(68); } @@ -63,5 +63,8 @@ static const struct cros_gpio cros_gpios[] = { void mainboard_chromeos_acpi_generate(void) { + if (CONFIG(CHROMEOS_NVS) && !parrot_ec_running_ro()) + chromeos_set_ecfw_rw(); + chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios)); } diff --git a/src/mainboard/google/parrot/ec.h b/src/mainboard/google/parrot/ec.h index 98c81b6f4e..ff9d558e27 100644 --- a/src/mainboard/google/parrot/ec.h +++ b/src/mainboard/google/parrot/ec.h @@ -43,7 +43,6 @@ #ifndef __ACPI__ extern void parrot_ec_init(void); u8 parrot_rev(void); -int parrot_ec_running_ro(void); #endif #endif // PARROT_EC_H diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c index 19549afa25..07e6319897 100644 --- a/src/mainboard/google/stout/acpi_tables.c +++ b/src/mainboard/google/stout/acpi_tables.c @@ -2,10 +2,6 @@ #include <acpi/acpi.h> #include <acpi/acpi_gnvs.h> -#include <device/device.h> -#include <bootmode.h> -#include <ec/quanta/it8518/ec.h> -#include "ec.h" #include "onboard.h" #include <southbridge/intel/bd82x6x/pch.h> @@ -22,9 +18,6 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->s5u0 = 0; gnvs->s5u1 = 0; - if (CONFIG(CHROMEOS_NVS) && !get_recovery_mode_switch()) - gnvs_set_ecfw_rw(); - /* EC handles all thermal and fan control on Stout. */ gnvs->tcrt = CRITICAL_TEMPERATURE; gnvs->tpsv = PASSIVE_TEMPERATURE; diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c index dfab358abc..07fdee3281 100644 --- a/src/mainboard/google/stout/chromeos.c +++ b/src/mainboard/google/stout/chromeos.c @@ -81,5 +81,8 @@ static const struct cros_gpio cros_gpios[] = { void mainboard_chromeos_acpi_generate(void) { + if (CONFIG(CHROMEOS_NVS) && !get_recovery_mode_switch()) + chromeos_set_ecfw_rw(); + chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios)); } diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c index 282ba34c6a..620ed06444 100644 --- a/src/mainboard/samsung/lumpy/acpi_tables.c +++ b/src/mainboard/samsung/lumpy/acpi_tables.c @@ -3,7 +3,6 @@ #include <acpi/acpi.h> #include <acpi/acpi_gnvs.h> #include <device/device.h> -#include <ec/acpi/ec.h> #include <soc/nvs.h> #include "thermal.h" @@ -43,7 +42,4 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->tpsv = PASSIVE_TEMPERATURE; gnvs->tmax = MAX_TEMPERATURE; gnvs->flvl = 5; - - if (CONFIG(CHROMEOS_NVS) && ec_read(0xcb)) - gnvs_set_ecfw_rw(); } diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c index cd4f924f1e..aa96153c29 100644 --- a/src/mainboard/samsung/lumpy/chromeos.c +++ b/src/mainboard/samsung/lumpy/chromeos.c @@ -75,5 +75,8 @@ static const struct cros_gpio cros_gpios[] = { void mainboard_chromeos_acpi_generate(void) { + if (CONFIG(CHROMEOS_NVS) && ec_read(0xcb)) + chromeos_set_ecfw_rw(); + chromeos_acpi_gpio_generate(cros_gpios, ARRAY_SIZE(cros_gpios)); } diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index 2b7be90912..04805f2b21 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -30,6 +30,7 @@ void mainboard_prepare_cr50_reset(void); void cbmem_add_vpd_calibration_data(void); void chromeos_set_me_hash(u32*, int); void chromeos_set_ramoops(void *ram_oops, size_t size); +void chromeos_set_ecfw_rw(void); /** * get_dsm_calibration_from_key - Gets value related to DSM calibration from VPD diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c index 6e0e9f82db..9395f45fba 100644 --- a/src/vendorcode/google/chromeos/gnvs.c +++ b/src/vendorcode/google/chromeos/gnvs.c @@ -76,7 +76,7 @@ void chromeos_set_ramoops(void *ram_oops, size_t size) chromeos_acpi->ramoops_len = size; } -void gnvs_set_ecfw_rw(void) +void chromeos_set_ecfw_rw(void) { if (!chromeos_acpi) return; |