diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2019-05-30 16:59:25 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-06 00:32:29 +0000 |
| commit | 9a5e19845eb76e0b10311b4829ab39ba73835fa3 (patch) | |
| tree | 02c7c67dd19b8b06df17ea48484e92def3521dbe /util/ec_flash.c | |
| parent | dc5bb3536677fb332c4a3f71d31b57647ff9a7a8 (diff) | |
| download | chrome-ec-9a5e19845eb76e0b10311b4829ab39ba73835fa3.tar.gz | |
ectool: add async flash erase
BRANCH=none
TEST=ectool --name=cros_fp reboot_ec; sleep 0.5 && \
ectool --name=cros_fp rwsigaction abort; \
ectool --name=cros_fp flasheraseasync 393216 131072
(using hatch EVT fingerprint board: STM32F412)
TEST=make buildall -j
BUG=b:132444384
Change-Id: I4a78c5bf7ef323a14083cc9d5fa3ec2c5218245d
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1637496
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'util/ec_flash.c')
| -rw-r--r-- | util/ec_flash.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/util/ec_flash.c b/util/ec_flash.c index 93705694e3..c61720a1c2 100644 --- a/util/ec_flash.c +++ b/util/ec_flash.c @@ -11,6 +11,11 @@ #include "comm-host.h" #include "misc_util.h" +#include "timer.h" + +static const uint32_t ERASE_ASYNC_TIMEOUT = 10 * SECOND; +static const uint32_t ERASE_ASYNC_WAIT = 500 * MSEC; +static const int FLASH_ERASE_BUSY_RV = -EECRESULT - EC_RES_BUSY; int ec_flash_read(uint8_t *buf, int offset, int size) { @@ -125,3 +130,37 @@ int ec_flash_erase(int offset, int size) return ec_command(EC_CMD_FLASH_ERASE, 0, &p, sizeof(p), NULL, 0); } + +int ec_flash_erase_async(int offset, int size) +{ + struct ec_params_flash_erase_v1 p = { 0 }; + uint32_t timeout = 0; + int rv = FLASH_ERASE_BUSY_RV; + + p.cmd = FLASH_ERASE_SECTOR_ASYNC; + p.params.offset = offset; + p.params.size = size; + + rv = ec_command(EC_CMD_FLASH_ERASE, 1, &p, sizeof(p), NULL, 0); + + if (rv < 0) + return rv; + + rv = FLASH_ERASE_BUSY_RV; + + while (rv < 0 && timeout < ERASE_ASYNC_TIMEOUT) { + /* + * The erase is not complete until FLASH_ERASE_GET_RESULT + * returns success. It's important that we retry even when the + * underlying ioctl returns an error (not just + * FLASH_ERASE_BUSY_RV). + * + * See https://crrev.com/c/511805 for details. + */ + usleep(ERASE_ASYNC_WAIT); + timeout += ERASE_ASYNC_WAIT; + p.cmd = FLASH_ERASE_GET_RESULT; + rv = ec_command(EC_CMD_FLASH_ERASE, 1, &p, sizeof(p), NULL, 0); + } + return rv; +} |