commit 2dbd91b3bc98297fc2cc8b247c2d096d1994fda8
author Alphan Ulusoy <alphan@google.com> Fri Sep 09 17:09:51 2022 -0400
committer Alphan Ulusoy <alphan@google.com> Mon Sep 12 10:27:24 2022 -0400
tree ad364d7a8f811335b5a797bc52d1df6eb2abbc34
parent 91e674c39b045e5c85f17e0989cae1a719280bc7

[sw/silicon_creator] Clear status bits after ignored cmds in bootstrap phase 1

Fixes #14871

Signed-off-by: Alphan Ulusoy <alphan@google.com>

sw/device/silicon_creator/rom/bootstrap.c

diff --git a/sw/device/silicon_creator/rom/bootstrap.c b/sw/device/silicon_creator/rom/bootstrap.c
index fdb3aa5..0ec2c6e 100644
--- a/sw/device/silicon_creator/rom/bootstrap.c
+++ b/sw/device/silicon_creator/rom/bootstrap.c
@@ -231,14 +231,16 @@
       error = bootstrap_chip_erase();
       HARDENED_RETURN_IF_ERROR(error);
       *state = kBootstrapStateEraseVerify;
+      // Note: We clear WIP and WEN bits in `bootstrap_handle_erase_verify()`
+      // after checking that both data banks have been erased.
       break;
     default:
-      // Ignore any other command, e.g. PAGE_PROGRAM, RESET.
+      // Ignore any other command, e.g. PAGE_PROGRAM, RESET, and clear WIP and
+      // WEN bits right away.
+      spi_device_flash_status_clear();
       error = kErrorOk;
   }
 
-  // Note: We clear WIP and WEN bits in `bootstrap_handle_erase_verify()` after
-  // checking that both data banks have been erased.
   return error;
 }
 

sw/device/silicon_creator/rom/bootstrap_unittest.cc

diff --git a/sw/device/silicon_creator/rom/bootstrap_unittest.cc b/sw/device/silicon_creator/rom/bootstrap_unittest.cc
index 3de843a..1f3f987 100644
--- a/sw/device/silicon_creator/rom/bootstrap_unittest.cc
+++ b/sw/device/silicon_creator/rom/bootstrap_unittest.cc
@@ -471,20 +471,21 @@
 }
 
 TEST_F(BootstrapTest, IgnoredCommands) {
-  // Erase
+  // Phase 1: Erase
   ExpectBootstrapRequestCheck(true);
   EXPECT_CALL(spi_device_, Init());
   ExpectSpiCmd(ChipEraseCmd());  // Ignored, missing WREN.
   ExpectSpiFlashStatusGet(false);
   ExpectSpiCmd(ResetCmd());  // Ignored, not supported.
   ExpectSpiFlashStatusGet(true);
+  EXPECT_CALL(spi_device_, FlashStatusClear());
   ExpectSpiCmd(ChipEraseCmd());
   ExpectSpiFlashStatusGet(true);
   ExpectFlashCtrlChipErase(kErrorOk, kErrorOk);
-  // Verify
+  // Phase 1: Verify
   ExpectFlashCtrlEraseVerify(kErrorOk, kErrorOk);
   EXPECT_CALL(spi_device_, FlashStatusClear());
-  // Erase/Program
+  // Phase 2: Erase/Program
   ExpectSpiCmd(SectorEraseCmd(0));
   ExpectSpiFlashStatusGet(false);
   ExpectSpiCmd(ChipEraseCmd());