motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 01:03:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

esp.c: untangle MESSAGE OUT and COMMAND phase logic in do_dma_pdma_cb()

Browse source 
This makes it clearer that ATN is asserted until the end of the next TI command
in the MESSAGE OUT phase.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20240112125420.514425-48-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2024-01-12 12:53:39 +00:00
parent 46b0c36125
commit 9e60cf788c
1 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

66
hw/scsi/esp.c
View file

@ -536,36 +536,30 @@ static void do_dma_pdma_cb(ESPState *s)
{ {
uint8_t buf[ESP_CMDFIFO_SZ]; uint8_t buf[ESP_CMDFIFO_SZ];
int len; int len;
uint32_t n; uint32_t n, cmdlen;
len = esp_get_tc(s);
switch (esp_get_phase(s)) { switch (esp_get_phase(s)) {
case STAT_MO: case STAT_MO:
case STAT_CD: if (s->dma_memory_read) {
/* Copy FIFO into cmdfifo */ len = MIN(len, fifo8_num_free(&s->cmdfifo));
n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo)); s->dma_memory_read(s->dma_opaque, buf, len);
n = MIN(fifo8_num_free(&s->cmdfifo), n); fifo8_push_all(&s->cmdfifo, buf, len);
fifo8_push_all(&s->cmdfifo, buf, n); esp_set_tc(s, esp_get_tc(s) - len);
s->cmdfifo_cdb_offset += len;
/* Ensure we have received complete command after SATN and stop */ } else {
if (esp_get_tc(s) || fifo8_is_empty(&s->cmdfifo)) { n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
return; n = MIN(fifo8_num_free(&s->cmdfifo), n);
fifo8_push_all(&s->cmdfifo, buf, n);
s->cmdfifo_cdb_offset += n;
} }
s->ti_size = 0; esp_set_pdma_cb(s, DO_DMA_PDMA_CB);
if (esp_get_phase(s) == STAT_CD) { esp_raise_drq(s);
/* No command received */
if (s->cmdfifo_cdb_offset == fifo8_num_used(&s->cmdfifo)) {
return;
}
/* Command has been received */ /* ATN remains asserted until TC == 0 */
do_cmd(s); if (esp_get_tc(s) == 0) {
} else {
/*
* Extra message out bytes received: update cmdfifo_cdb_offset
* and then switch to command phase
*/
s->cmdfifo_cdb_offset = fifo8_num_used(&s->cmdfifo);
esp_set_phase(s, STAT_CD); esp_set_phase(s, STAT_CD);
s->rregs[ESP_RSEQ] = SEQ_CD; s->rregs[ESP_RSEQ] = SEQ_CD;
s->rregs[ESP_RINTR] |= INTR_BS; s->rregs[ESP_RINTR] |= INTR_BS;
@ -573,6 +567,30 @@ static void do_dma_pdma_cb(ESPState *s)
} }
break; break;
case STAT_CD:
cmdlen = fifo8_num_used(&s->cmdfifo);
trace_esp_do_dma(cmdlen, len);
if (s->dma_memory_read) {
len = MIN(len, fifo8_num_free(&s->cmdfifo));
s->dma_memory_read(s->dma_opaque, buf, len);
fifo8_push_all(&s->cmdfifo, buf, len);
esp_set_tc(s, esp_get_tc(s) - len);
} else {
n = esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo));
n = MIN(fifo8_num_free(&s->cmdfifo), n);
fifo8_push_all(&s->cmdfifo, buf, n);
esp_set_pdma_cb(s, DO_DMA_PDMA_CB);
esp_raise_drq(s);
}
trace_esp_handle_ti_cmd(cmdlen);
s->ti_size = 0;
if (esp_get_tc(s) == 0) {
/* Command has been received */
do_cmd(s);
}
break;
case STAT_DO: case STAT_DO:
if (!s->current_req) { if (!s->current_req) {
return; return;