[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/5] esp: allow non-DMA callback in esp_transfer_data() initial t
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 1/5] esp: allow non-DMA callback in esp_transfer_data() initial transfer |
Date: |
Wed, 19 May 2021 11:07:59 +0100 |
The current implementation only resumes DMA transfers when incoming data is
received from the target device, but this is also required for non-DMA transfers
with the next set of non-DMA changes.
Rather than duplicate the DMA/non-DMA dispatch logic in the initial transfer
section, update the code so that the initial transfer section can just
fallthrough to the main DMA/non-DMA dispatch logic.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index b668acef82..a611718769 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -804,16 +804,6 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len)
s->rregs[ESP_RSTAT] |= STAT_TC;
s->rregs[ESP_RINTR] |= INTR_BS;
esp_raise_irq(s);
-
- /*
- * If data is ready to transfer and the TI command has already
- * been executed, start DMA immediately. Otherwise DMA will start
- * when host sends the TI command
- */
- if (s->ti_size && (s->rregs[ESP_CMD] == (CMD_TI | CMD_DMA))) {
- esp_do_dma(s);
- }
- return;
}
if (s->ti_cmd == 0) {
@@ -827,7 +817,7 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len)
return;
}
- if (s->ti_cmd & CMD_DMA) {
+ if (s->ti_cmd == (CMD_TI | CMD_DMA)) {
if (dmalen) {
esp_do_dma(s);
} else if (s->ti_size <= 0) {
@@ -838,7 +828,7 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len)
esp_dma_done(s);
esp_lower_drq(s);
}
- } else {
+ } else if (s->ti_cmd == CMD_TI) {
esp_do_nodma(s);
}
}
--
2.20.1
- [PATCH 0/5] esp: fixes for MacOS toolbox ROM, Mark Cave-Ayland, 2021/05/19
- [PATCH 2/5] esp: handle non-DMA transfers from the target one byte at a time, Mark Cave-Ayland, 2021/05/19
- [PATCH 3/5] esp: ensure PDMA write transfers are flushed from the FIFO to the target immediately, Mark Cave-Ayland, 2021/05/19
- [PATCH 4/5] esp: revert 75ef849696 "esp: correctly fill bus id with requested lun", Mark Cave-Ayland, 2021/05/19
- [PATCH 5/5] esp: correctly accumulate extended messages for PDMA, Mark Cave-Ayland, 2021/05/19
- [PATCH 1/5] esp: allow non-DMA callback in esp_transfer_data() initial transfer,
Mark Cave-Ayland <=
- Re: [PATCH 0/5] esp: fixes for MacOS toolbox ROM, Mark Cave-Ayland, 2021/05/28