diff options
| author | Rob Barnes <robbarnes@google.com> | 2021-09-17 09:42:53 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-20 13:17:52 +0000 |
| commit | c1ef7c696c45632503165cbabb1e37cbabfbe448 (patch) | |
| tree | b783829513b4f39cc6742aae2ae9d6c09f5a90f0 /util | |
| parent | 217975bb1402f1ab76e84ebdf804884be6353924 (diff) | |
| download | chrome-ec-c1ef7c696c45632503165cbabb1e37cbabfbe448.tar.gz | |
ec_commands: Add ec_response_get_version_v1
A field (cros_fwid_rw) was added to ec_response_get_version and the
version was updated to v1. Some system components that still use v0
of the version host command fail because the size of the response
does not match the updated ec_response_get_version struct.
Restore ec_response_get_version to match v0. Create a new
ec_response_get_version_v1 structure with the added v1 fields.
This allows legacy code to continue using ec_response_get_version,
which matches the expected response size for the v0 command.
BUG=b:188073399,b:200075921
TEST=EC console 'version' works
Legacy 'ectool version' works with old an new EC firmware.
New 'ectool version' works with old and new EC firmware.
BRANCH=None
Change-Id: I51a052a550c2460f2604da8e04fc43c36acba4d5
Signed-off-by: Rob Barnes <robbarnes@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3169100
Reviewed-by: caveh jalali <caveh@chromium.org>
Reviewed-by: Patryk Duda <patrykd@google.com>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/ectool.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/util/ectool.c b/util/ectool.c index 4f983e24f1..79e496f262 100644 --- a/util/ectool.c +++ b/util/ectool.c @@ -1069,23 +1069,26 @@ int cmd_uptimeinfo(int argc, char *argv[]) int cmd_version(int argc, char *argv[]) { - struct ec_response_get_version r; + struct ec_response_get_version_v1 r; char *build_string = (char *)ec_inbuf; - int cmdver = 1; int rv; - if (!ec_cmd_version_supported(EC_CMD_GET_VERSION, 1)) { - cmdver = 0; - /* CrOS FWID is not supported. Set it to empty string. */ + if (ec_cmd_version_supported(EC_CMD_GET_VERSION, 1)) { + rv = ec_command(EC_CMD_GET_VERSION, 1, NULL, 0, &r, + sizeof(struct ec_response_get_version_v1)); + } else { + /* Fall-back to version 0 if version 1 is not supported */ + rv = ec_command(EC_CMD_GET_VERSION, 0, NULL, 0, &r, + sizeof(struct ec_response_get_version)); + /* These fields are not supported in version 0, ensure empty */ r.cros_fwid_ro[0] = '\0'; r.cros_fwid_rw[0] = '\0'; } - - rv = ec_command(EC_CMD_GET_VERSION, cmdver, NULL, 0, &r, sizeof(r)); if (rv < 0) { fprintf(stderr, "ERROR: EC_CMD_GET_VERSION failed: %d\n", rv); goto exit; } + rv = ec_command(EC_CMD_GET_BUILD_INFO, 0, NULL, 0, ec_inbuf, ec_max_insize); if (rv < 0) { @@ -1104,10 +1107,10 @@ int cmd_version(int argc, char *argv[]) r.cros_fwid_rw[sizeof(r.cros_fwid_rw) - 1] = '\0'; /* Print versions */ printf("RO version: %s\n", r.version_string_ro); - if (cmdver > 0 && strlen(r.cros_fwid_ro)) + if (strlen(r.cros_fwid_ro)) printf("RO cros fwid: %s\n", r.cros_fwid_ro); printf("RW version: %s\n", r.version_string_rw); - if (cmdver > 0 && strlen(r.cros_fwid_rw)) + if (strlen(r.cros_fwid_rw)) printf("RW cros fwid: %s\n", r.cros_fwid_rw); printf("Firmware copy: %s\n", (r.current_image < ARRAY_SIZE(image_names) ? |