depthcharge: remove the test for EC command version
This support is no longer needed and was causing trouble for coreboot on snow.
BUG=None
TEST=build and boot this on snow and notice there are no more error messages
such as
Command version >0 unsupported
BRANCH=none
Change-Id: Idbea9142f125ed373680920f9e399e5c15c84e28
Signed-off-by: Ronald G. Minnich <rminnich@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/48263
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
diff --git a/src/drivers/ec/chromeos/mkbp.c b/src/drivers/ec/chromeos/mkbp.c
index 492c781..af038c9 100644
--- a/src/drivers/ec/chromeos/mkbp.c
+++ b/src/drivers/ec/chromeos/mkbp.c
@@ -97,11 +97,6 @@
uint8_t *din;
int len;
- if (cmd_version != 0 && !dev->cmd_version_is_supported) {
- printf("%s: Command version >0 unsupported\n", __func__);
- return -1;
- }
-
len = mkbp_bus_command(dev, cmd, cmd_version, dout,
dout_len, &din, din_len);
diff --git a/src/drivers/ec/chromeos/mkbp.h b/src/drivers/ec/chromeos/mkbp.h
index 9d97773..8794c3b 100644
--- a/src/drivers/ec/chromeos/mkbp.h
+++ b/src/drivers/ec/chromeos/mkbp.h
@@ -32,7 +32,6 @@
/* Our configuration information */
struct mkbp_dev {
- int cmd_version_is_supported; /* Device supports command versions */
int optimise_flash_write; /* Don't write erased flash blocks */
uint8_t din[MSG_BYTES] __attribute__((aligned(sizeof(int64_t))));
diff --git a/src/drivers/ec/chromeos/mkbp_i2c.c b/src/drivers/ec/chromeos/mkbp_i2c.c
index 7924b5d..6fc7c7b 100644
--- a/src/drivers/ec/chromeos/mkbp_i2c.c
+++ b/src/drivers/ec/chromeos/mkbp_i2c.c
@@ -76,23 +76,14 @@
* will be dword aligned.
*/
in_ptr = dev->din + sizeof(int64_t);
- if (!dev->cmd_version_is_supported) {
- /* Send an old-style command */
- *ptr++ = cmd;
- out_bytes = dout_len + 1;
- in_bytes = din_len + 2;
- in_ptr--; /* Expect just a status byte */
- } else {
- *ptr++ = EC_CMD_VERSION0 + cmd_version;
- *ptr++ = cmd;
- *ptr++ = dout_len;
- in_ptr -= 2; /* Expect status, length bytes */
- }
+ *ptr++ = EC_CMD_VERSION0 + cmd_version;
+ *ptr++ = cmd;
+ *ptr++ = dout_len;
+ in_ptr -= 2; /* Expect status, length bytes */
memcpy(ptr, dout, dout_len);
ptr += dout_len;
- if (dev->cmd_version_is_supported)
- *ptr++ = (uint8_t)mkbp_calc_checksum(dev->dout, dout_len + 3);
+ *ptr++ = (uint8_t)mkbp_calc_checksum(dev->dout, dout_len + 3);
/* Send output data */
mkbp_dump_data("out", -1, dev->dout, out_bytes);
@@ -113,26 +104,22 @@
return -(int)*in_ptr;
}
- if (dev->cmd_version_is_supported) {
- int len, csum;
+ int len, csum;
- len = in_ptr[1];
- if (len + 3 > sizeof(dev->din)) {
- printf("%s: Received length %#02x too large\n",
- __func__, len);
- return -1;
- }
- csum = mkbp_calc_checksum(in_ptr, 2 + len);
- if (csum != in_ptr[2 + len]) {
- printf("%s: Invalid checksum rx %#02x, calced %#02x\n",
- __func__, in_ptr[2 + din_len], csum);
- return -1;
- }
- din_len = MIN(din_len, len);
- mkbp_dump_data("in", -1, in_ptr, din_len + 3);
- } else {
- mkbp_dump_data("in (old)", -1, in_ptr, in_bytes);
+ len = in_ptr[1];
+ if (len + 3 > sizeof(dev->din)) {
+ printf("%s: Received length %#02x too large\n",
+ __func__, len);
+ return -1;
}
+ csum = mkbp_calc_checksum(in_ptr, 2 + len);
+ if (csum != in_ptr[2 + len]) {
+ printf("%s: Invalid checksum rx %#02x, calced %#02x\n",
+ __func__, in_ptr[2 + din_len], csum);
+ return -1;
+ }
+ din_len = MIN(din_len, len);
+ mkbp_dump_data("in", -1, in_ptr, din_len + 3);
/* Return pointer to dword-aligned input data, if any */
*dinp = dev->din + sizeof(int64_t);
@@ -148,7 +135,6 @@
*/
int mkbp_bus_init(struct mkbp_dev *dev)
{
- dev->cmd_version_is_supported = 0;
return 0;
}
