diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 21:57:08 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:54:24 +0000 |
| commit | e6a93af1f7845406f92817a93f02b2803363f480 (patch) | |
| tree | 420daac336935e1e258d5bf7b82341c370311dc8 | |
| parent | 0598e84782362eb2859fdcc42d4bf64bc4103d5e (diff) | |
| download | chrome-ec-e6a93af1f7845406f92817a93f02b2803363f480.tar.gz | |
Revert "hostcmd: Remove EC_CMD_VBNV_CONTEXT handler for most boards"
This reverts commit 6ba124a81bd6d5af1edae5f30add22e81b8b7de7.
BUG=b:200823466
TEST=make buildall -j
Change-Id: I4038924250569e3bb8b491ded4eef1a61f98a4bb
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273470
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
| -rw-r--r-- | common/system.c | 10 | ||||
| -rw-r--r-- | include/config.h | 5 | ||||
| -rw-r--r-- | include/system.h | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/common/system.c b/common/system.c index c886fd4e3f..96fc57f4b9 100644 --- a/common/system.c +++ b/common/system.c @@ -1187,7 +1187,6 @@ DECLARE_HOST_COMMAND(EC_CMD_GET_BOARD_VERSION, EC_VER_MASK(0)); #endif -#ifdef CONFIG_HOSTCMD_VBNV_CONTEXT enum ec_status host_command_vbnvcontext(struct host_cmd_handler_args *args) { const struct ec_params_vbnvcontext *p = args->params; @@ -1215,10 +1214,15 @@ enum ec_status host_command_vbnvcontext(struct host_cmd_handler_args *args) return EC_RES_SUCCESS; } + +/* + * TODO(crbug.com/239197) : Adding both versions to the version mask is a + * temporary workaround for a problem in the cros_ec driver. Drop + * EC_VER_MASK(0) once cros_ec driver can send the correct version. + */ DECLARE_HOST_COMMAND(EC_CMD_VBNV_CONTEXT, host_command_vbnvcontext, - EC_VER_MASK(EC_VER_VBNV_CONTEXT)); -#endif /* CONFIG_HOSTCMD_VBNV_CONTEXT */ + EC_VER_MASK(EC_VER_VBNV_CONTEXT) | EC_VER_MASK(0)); enum ec_status host_command_reboot(struct host_cmd_handler_args *args) { diff --git a/include/config.h b/include/config.h index fa9eb793ff..ffcb183ab9 100644 --- a/include/config.h +++ b/include/config.h @@ -1970,12 +1970,9 @@ /* Panic when status of PD MCU reflects that it has crashed */ #undef CONFIG_HOSTCMD_PD_PANIC -/* Board supports RTC host commands */ +/* Board supports RTC host commands*/ #undef CONFIG_HOSTCMD_RTC -/* For access to VBNV on-EC battery-backed storage */ -#undef CONFIG_HOSTCMD_VBNV_CONTEXT - /* Command to issue AP reset */ #undef CONFIG_HOSTCMD_AP_RESET diff --git a/include/system.h b/include/system.h index a08492c7b8..f2d08f74b9 100644 --- a/include/system.h +++ b/include/system.h @@ -274,6 +274,10 @@ int system_get_chip_unique_id(uint8_t **id); * not implemented. */ enum system_bbram_idx { + /* + * TODO(crbug.com/693210): Consider boards without vbnvcontext + * host command. + */ SYSTEM_BBRAM_IDX_VBNVBLOCK0 = 0, /* * ... |