[ot] hw/opentitan: ot_spi_device: improve traces when entering error state

Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>

Author: rivos-eblot

hw/opentitan/ot_spi_device.c

@@ -890,8 +890,9 @@ static void ot_spi_device_flash_change_state_line(
     SpiDeviceFlash *f, OtSpiFlashState state, int line)
 {
     if (f->state != state) {
-        trace_ot_spi_device_flash_change_state(line, FLASH_STATE_NAME(state),
-                                               state);
+        trace_ot_spi_device_flash_change_state(line, FLASH_STATE_NAME(f->state),
+                                               f->state,
+                                               FLASH_STATE_NAME(state), state);
         f->state = state;
     }
 }
@@ -1628,6 +1629,7 @@ static uint8_t ot_spi_device_flash_transfer(OtSPIDeviceState *s, uint8_t rx)
             break;
         case SPI_FLASH_CMD_NONE:
             /* this command cannot be processed, discard all remaining bytes */
+            trace_ot_spi_device_flash_unknown_command(rx);
             FLASH_CHANGE_STATE(f, ERROR);
             BUS_CHANGE_STATE(&s->bus, DISCARD);
             break;

hw/opentitan/trace-events

@@ -436,7 +436,7 @@ ot_spi_device_bus_change_state(int line, const char *state, int stateval) "@%d:
 ot_spi_device_chr_cs_assert(unsigned count, bool release, char rx, char tx, const char *st) "0x%x bytes, /cs: %u, rx: %csb, tx: %csb, mode:%s"
 ot_spi_device_chr_error(const char *err) "%s"
 ot_spi_device_flash_byte_unexpected(uint8_t rx) "unexpected byte 0x%02x after completed command"
-ot_spi_device_flash_change_state(int line, const char *state, int stateval) "@%d: %s [%d]"
+ot_spi_device_flash_change_state(int line, const char *prev, int preval, const char *next, int nextval) "@%d: %s[%d] -> %s[%d]"
 ot_spi_device_flash_cross_buffer(const char *msg, uint32_t addr) "%s 0x%08x"
 ot_spi_device_flash_disabled_slot(uint8_t cmd, unsigned slot) "cmd 0x%02x matching disabled slot %u"
 ot_spi_device_flash_exec(const char *cmd) "%s"
@@ -449,6 +449,7 @@ ot_spi_device_flash_push_address(uint32_t address) "0x%08x"
 ot_spi_device_flash_set_read_addr(uint32_t addr) "0x%08x"
 ot_spi_device_flash_read_status(unsigned slot, uint8_t status) "sr[%u] 0x%02x"
 ot_spi_device_flash_read_threshold(uint32_t addr, uint32_t threshold) "0x%08x @ 0x%08x"
+ot_spi_device_flash_unknown_command(uint8_t opcode) "0x%02x"
 ot_spi_device_flash_upload(unsigned slot, uint32_t cmd_info, bool busy) "slot:%d info:0x%08x busy:%u"
 ot_spi_device_gen_fifo_error(const char *msg) "%s"
 ot_spi_device_gen_phase(const char *func, unsigned off, unsigned lim, bool phase) "%s off:0x%03x lim:0x%03x ph:%u"