[ot] hw/opentitan: spi_device: discard all packets in failed transaction

If one packet in a transaction triggers an error and needs discarding,
we must continue discarding the remaining packets until CS is released.

Signed-off-by: James Wainwright <[email protected]>

Author: jwnrt

hw/opentitan/ot_spi_device.c

@@ -419,6 +419,7 @@ typedef struct {
     Fifo8 chr_fifo; /* QEMU protocol input FIFO */
     uint8_t mode; /* Polarity/phase mismatch */
     bool release; /* Whether to release /CS on last byte */
+    bool failed_transaction; /* Whether to discard until /CS is deasserted */
     bool rev_rx; /* Reverse RX bits */
     bool rev_tx; /* Reverse TX bits */
 } SpiDeviceBus;
@@ -801,6 +802,7 @@ static void ot_spi_device_release(OtSPIDeviceState *s)
 
     BUS_CHANGE_STATE(s, IDLE);
     bus->byte_count = 0;
+    bus->failed_transaction = false;
 
     bool update_irq = false;
     switch (ot_spi_device_get_mode(s)) {
@@ -1924,6 +1926,12 @@ static void ot_spi_device_chr_handle_header(OtSPIDeviceState *s)
         return;
     }
 
+    /* discard the packet if we're within a failed transaction */
+    if (bus->failed_transaction) {
+        BUS_CHANGE_STATE(s, DISCARD);
+        return;
+    }
+
     switch (ot_spi_device_get_mode(s)) {
     case CTRL_MODE_FLASH:
         BUS_CHANGE_STATE(s, FLASH);
@@ -2028,6 +2036,8 @@ static void ot_spi_device_chr_receive(void *opaque, const uint8_t *buf,
     case SPI_BUS_DISCARD:
     case SPI_BUS_ERROR:
         ot_spi_device_chr_recv_discard(s, buf, (unsigned)size);
+        /* we need to discard the other packets in this transaction */
+        bus->failed_transaction = true;
         break;
     default:
         g_assert_not_reached();