ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

esp.c: remove explicit setting of DRQ within ESP state machine 

Now the esp_update_drq() is called for all reads/writes to the FIFO, there is
no need to manually raise and lower the DRQ signal.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/611
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1831
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20240324191707.623175-18-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-03-24 19:17:06 +00:00
parent 60c572502c
commit d7fe931818
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/scsi/esp.c
View File

@ -506,7 +506,6 @@ static void esp_dma_ti_check(ESPState *s)
if (esp_get_tc(s) == 0 && fifo8_num_used(&s->fifo) < 2) { if (esp_get_tc(s) == 0 && fifo8_num_used(&s->fifo) < 2) {
s->rregs[ESP_RINTR] |= INTR_BS; s->rregs[ESP_RINTR] |= INTR_BS;
esp_raise_irq(s); esp_raise_irq(s);
esp_lower_drq(s);
} }
} }
@ -526,7 +525,6 @@ static void esp_do_dma(ESPState *s)
} else { } else {
len = esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo)); len = esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo));
len = MIN(fifo8_num_free(&s->cmdfifo), len); len = MIN(fifo8_num_free(&s->cmdfifo), len);
esp_raise_drq(s);
} }
fifo8_push_all(&s->cmdfifo, buf, len); fifo8_push_all(&s->cmdfifo, buf, len);
@ -583,7 +581,6 @@ static void esp_do_dma(ESPState *s)
len = esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo)); len = esp_fifo_pop_buf(s, buf, fifo8_num_used(&s->fifo));
len = MIN(fifo8_num_free(&s->cmdfifo), len); len = MIN(fifo8_num_free(&s->cmdfifo), len);
fifo8_push_all(&s->cmdfifo, buf, len); fifo8_push_all(&s->cmdfifo, buf, len);
esp_raise_drq(s);
} }
trace_esp_handle_ti_cmd(cmdlen); trace_esp_handle_ti_cmd(cmdlen);
s->ti_size = 0; s->ti_size = 0;
@ -615,7 +612,6 @@ static void esp_do_dma(ESPState *s)
len = MIN(s->async_len, ESP_FIFO_SZ); len = MIN(s->async_len, ESP_FIFO_SZ);
len = MIN(len, fifo8_num_used(&s->fifo)); len = MIN(len, fifo8_num_used(&s->fifo));
len = esp_fifo_pop_buf(s, s->async_buf, len); len = esp_fifo_pop_buf(s, s->async_buf, len);
esp_raise_drq(s);
} }
s->async_buf += len; s->async_buf += len;
@ -667,7 +663,6 @@ static void esp_do_dma(ESPState *s)
/* Copy device data to FIFO */ /* Copy device data to FIFO */
len = MIN(len, fifo8_num_free(&s->fifo)); len = MIN(len, fifo8_num_free(&s->fifo));
esp_fifo_push_buf(s, s->async_buf, len); esp_fifo_push_buf(s, s->async_buf, len);
esp_raise_drq(s);
} }
s->async_buf += len; s->async_buf += len;
@ -733,7 +728,6 @@ static void esp_do_dma(ESPState *s)
if (fifo8_num_used(&s->fifo) < 2) { if (fifo8_num_used(&s->fifo) < 2) {
s->rregs[ESP_RINTR] |= INTR_BS; s->rregs[ESP_RINTR] |= INTR_BS;
esp_raise_irq(s); esp_raise_irq(s);
esp_lower_drq(s);
} }
break; break;
} }
@ -1021,9 +1015,6 @@ void esp_command_complete(SCSIRequest *req, size_t resid)
s->rregs[ESP_RINTR] |= INTR_BS; s->rregs[ESP_RINTR] |= INTR_BS;
esp_raise_irq(s); esp_raise_irq(s);
/* Ensure DRQ is set correctly for TC underflow or normal completion */
esp_dma_ti_check(s);
if (s->current_req) { if (s->current_req) {
scsi_req_unref(s->current_req); scsi_req_unref(s->current_req);
s->current_req = NULL; s->current_req = NULL;