[PATCH 44/88] esp.c: convert esp_reg_write() do_cmd path to check for SCSI phase instead

Currently do_cmd is used to determine whether MESSAGE OUT and COMMAND phase data
is being accumulated in cmdfifo. Update esp_do_dma() to check directly for these
two SCSI phases instead.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/scsi/esp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 14759ada78..e679b1c39b 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -1207,7 +1207,7 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
         s->rregs[ESP_RSTAT] &= ~STAT_TC;
         break;
     case ESP_FIFO:
-        if (s->do_cmd) {
+        if (esp_get_phase(s) == STAT_MO || esp_get_phase(s) == STAT_CD) {
             if (!fifo8_is_full(&s->fifo)) {
                 esp_fifo_push(&s->fifo, val);
                 esp_fifo_push(&s->cmdfifo, fifo8_pop(&s->fifo));
-- 
2.39.2

• [PATCH 01/88] esp: don't clear cmdfifo when esp_select() fails in get_cmd()
• [PATCH 02/88] esp: move existing request cancel check into esp_select()
• [PATCH 03/88] esp.c: add FIFO wraparound support to esp_fifo_pop_buf()
• [PATCH 04/88] esp: remove FIFO clear from esp_select()
• [PATCH 05/88] esp: move esp_select() to ESP selection commands from get_cmd()
• [PATCH 06/88] esp: update esp_set_tc() to set STAT_TC flag
• [PATCH 07/88] esp: start removal of manual STAT_TC setting when transfer counter reaches zero
• [PATCH 08/88] esp: move command execution logic to new esp_run_cmd() function
• [PATCH 09/88] esp: update TC check logic in do_dma_pdma_cb() to check for TC == 0
• [PATCH 10/88] esp: move buffer and TC logic into separate to/from device paths in esp_do_dma()
• [PATCH 11/88] esp.c: remove unused case from esp_pdma_read()
• [PATCH 12/88] esp.c: don't accumulate directly into cmdfifo
• [PATCH 13/88] esp.c: decrement the TC during MESSAGE OUT and COMMAND phases
• [PATCH 14/88] esp.c: introduce esp_set_phase() helper function
• [PATCH 15/88] esp.c: remove another set of manual STAT_TC updates
• [PATCH 16/88] esp.c: remove MacOS TI workaround that pads FIFO transfers to ESP_FIFO_SZ
• [PATCH 17/88] esp.c: don't reset the TC and ESP_RSEQ state when executing a SCSI command
• [PATCH 18/88] esp.c: don't clear RFLAGS register when DMA is complete
• [PATCH 19/88] esp: remove zero transfer size check from esp_do_dma()
• [PATCH 20/88] esp.c: update condition for esp_dma_done() in esp_do_dma() from device path
• [PATCH 21/88] esp.c: update condition for esp_dma_done() in esp_do_dma() to device path
• [PATCH 22/88] esp.c: ensure that the PDMA callback is called for every device read
• [PATCH 23/88] esp.c: don't immediately raise INTR_BS if SCSI data needed in esp_do_dma()
• [PATCH 24/88] esp.c: remove TC adjustment in esp_do_dma() from device path
• [PATCH 25/88] esp.c: remove unaligned adjustment in do_dma_pdma_cb() to device path
• [PATCH 26/88] esp.c: remove unneeded if() check in esp_transfer_data()
• [PATCH 27/88] esp.c: update end of transfer logic at the end of esp_transfer_data()
• [PATCH 28/88] esp.c: consolidate async_len and TC == 0 checks in do_dma_pdma_cb() and esp_do_dma()
• [PATCH 29/88] esp.c: fix premature end of phase logic esp_command_complete
• [PATCH 30/88] esp.c: move TC and FIFO check logic into esp_dma_done()
• [PATCH 31/88] esp.c: rename esp_dma_done() to esp_dma_ti_check()
• [PATCH 32/88] esp.c: copy PDMA logic for transfers to device from do_dma_pdma_cb() to esp_do_dma()
• [PATCH 33/88] esp.c: copy logic for do_cmd transfers from do_dma_pdma_cb() to esp_do_dma()
• [PATCH 34/88] esp.c: update esp_do_dma() bypass if async_len is zero to include non-zero transfer check
• [PATCH 35/88] esp.c: move end of SCSI transfer check after TC adjustment in do_dma_pdma_cb()
• [PATCH 36/88] esp.c: remove s_without_satn_pdma_cb() PDMA callback
• [PATCH 37/88] esp.c: introduce esp_get_phase() function
• [PATCH 38/88] esp.c: convert esp_do_dma() to switch statement based upon SCSI phase
• [PATCH 39/88] esp.c: convert do_dma_pdma_db() to switch statement based upon SCSI phase
• [PATCH 40/88] esp.c: convert esp_do_nodma() to switch statement based upon SCSI phase
• [PATCH 41/88] esp.c: convert esp_do_dma() do_cmd path to check for SCSI phase instead
• [PATCH 42/88] esp.c: convert do_dma_pdma_cb() do_cmd path to check for SCSI phase instead
• [PATCH 43/88] esp.c: convert esp_do_nodma() do_cmd path to check for SCSI phase instead
• [PATCH 44/88] esp.c: convert esp_reg_write() do_cmd path to check for SCSI phase instead
• [PATCH 45/88] esp.c: remove do_cmd from ESPState
• [PATCH 46/88] esp.c: untangle MESSAGE OUT and COMMAND phase logic in esp_do_dma()
• [PATCH 47/88] esp.c: untangle MESSAGE OUT and COMMAND phase logic in do_dma_pdma_cb()
• [PATCH 48/88] esp.c: untangle MESSAGE OUT and COMMAND phase logic in esp_do_nodma()
• [PATCH 49/88] esp.c: move CMD_SELATN end of message phase detection to esp_do_dma() and do_dma_pdma_cb()
• [PATCH 50/88] esp.c: move CMD_TI end of message phase detection to esp_do_dma() and do_dma_pdma_cb()
• [PATCH 51/88] esp.c: don't use get_cmd() for CMD_SEL DMA commands
• [PATCH 52/88] esp.c: move CMD_SELATNS end of command logic to esp_do_dma() and do_dma_pdma_cb()
• [PATCH 53/88] esp.c: replace do_dma_pdma_cb() with esp_do_dma()
• [PATCH 54/88] esp.c: move CMD_ICCS command logic to esp_do_dma()
• [PATCH 55/88] esp.c: always use esp_do_dma() in pdma_cb()
• [PATCH 56/88] esp.c: remove unused PDMA callback implementation
• [PATCH 57/88] esp.c: rename data_in_ready to to data_ready
• [PATCH 58/88] esp.c: separate logic based upon ESP command in esp_command_complete()
• [PATCH 59/88] esp.c: separate logic based upon ESP command in esp_transfer_data()
• [PATCH 60/88] esp.c: use deferred interrupts for both DATA IN and DATA OUT phases
• [PATCH 61/88] esp.c: remove DATA IN phase logic when reading from FIFO
• [PATCH 62/88] esp.c: zero command register when TI command terminates due to phase change
• [PATCH 63/88] esp.c: remove unneeded ti_cmd field
• [PATCH 64/88] esp.c: don't raise INTR_BS interrupt in DATA IN phase until TI command issued
• [PATCH 65/88] esp.c: move non-DMA TI logic to separate esp_nodma_ti_dataout() function
• [PATCH 66/88] esp.c: process non-DMA FIFO writes in esp_do_nodma()
• [PATCH 67/88] esp.c: replace get_cmd() with esp_do_nodma()
• [PATCH 68/88] esp.c: move write_response() non-DMA logic to esp_do_nodma()
• [PATCH 69/88] esp.c: consolidate end of command sequence after ICCS command
• [PATCH 70/88] esp.c: ensure that STAT_INT is cleared when reading ESP_RINTR
• [PATCH 71/88] esp.c: don't clear the SCSI phase when reading ESP_RINTR
• [PATCH 72/88] esp.c: handle TC underflow for DMA SCSI requests
• [PATCH 73/88] esp.c: remove restriction on FIFO read access when DMA memory routines defined
• [PATCH 74/88] esp.c: handle non-DMA FIFO writes used to terminate DMA commands
• [PATCH 75/88] esp.c: improve ESP_RSEQ logic consolidation
• [PATCH 76/88] esp.c: only transfer non-DMA COMMAND phase data for specific commands
• [PATCH 77/88] esp.c: only transfer non-DMA MESSAGE OUT phase data for specific commands
• [PATCH 78/88] esp.c: consolidate DMA and PDMA logic in DATA OUT phase
• [PATCH 79/88] esp.c: consolidate DMA and PDMA logic in DATA IN phase
• [PATCH 80/88] esp.c: consolidate DMA and PDMA logic in MESSAGE OUT phase
• [PATCH 81/88] esp.c: remove redundant n variable in PDMA COMMAND phase
• [PATCH 82/88] esp.c: consolidate DMA and PDMA logic in STATUS and MESSAGE IN phases
• [PATCH 83/88] esp.c: replace n variable with len in esp_do_nodma()
• [PATCH 84/88] esp.c: implement DMA Transfer Pad command for DATA phases
• [PATCH 85/88] esp.c: rename irq_data IRQ to drq_irq
• [PATCH 86/88] esp.c: keep track of the DRQ state during DMA
• [PATCH 87/88] esp.c: switch TypeInfo registration to use DEFINE_TYPES() macro
• [PATCH 88/88] esp.c: add my copyright to the file