[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/42] esp: move pdma_len and TC logic into esp_pdma_read()/esp_pd
From: |
Mark Cave-Ayland |
Subject: |
[PULL 17/42] esp: move pdma_len and TC logic into esp_pdma_read()/esp_pdma_write() |
Date: |
Sun, 7 Mar 2021 12:08:25 +0000 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210304221103.6369-18-mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 50 ++++++++++++++++++++++++++++++++------------------
1 file changed, 32 insertions(+), 18 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 58be98f047..b8d1ec41e9 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -153,22 +153,45 @@ static uint8_t *get_pdma_buf(ESPState *s)
static uint8_t esp_pdma_read(ESPState *s)
{
+ uint32_t dmalen = esp_get_tc(s);
+ uint8_t val;
+
+ if (dmalen == 0 || s->pdma_len == 0) {
+ return 0;
+ }
+
switch (s->pdma_origin) {
case PDMA:
- return s->pdma_buf[s->pdma_cur++];
+ val = s->pdma_buf[s->pdma_cur++];
+ break;
case TI:
- return s->ti_buf[s->pdma_cur++];
+ val = s->ti_buf[s->pdma_cur++];
+ break;
case CMD:
- return s->cmdbuf[s->pdma_cur++];
+ val = s->cmdbuf[s->pdma_cur++];
+ break;
case ASYNC:
- return s->async_buf[s->pdma_cur++];
+ val = s->async_buf[s->pdma_cur++];
+ break;
default:
g_assert_not_reached();
}
+
+ s->pdma_len--;
+ dmalen--;
+ esp_set_tc(s, dmalen);
+
+ return val;
}
static void esp_pdma_write(ESPState *s, uint8_t val)
{
+ uint32_t dmalen = esp_get_tc(s);
+
+ if (dmalen == 0 || s->pdma_len == 0) {
+ return;
+ }
+
switch (s->pdma_origin) {
case PDMA:
s->pdma_buf[s->pdma_cur++] = val;
@@ -185,6 +208,10 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
default:
g_assert_not_reached();
}
+
+ s->pdma_len--;
+ dmalen--;
+ esp_set_tc(s, dmalen);
}
static int get_cmd_cb(ESPState *s)
@@ -944,27 +971,18 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr
addr,
{
SysBusESPState *sysbus = opaque;
ESPState *s = ESP(&sysbus->esp);
- uint32_t dmalen = esp_get_tc(s);
trace_esp_pdma_write(size);
- if (dmalen == 0 || s->pdma_len == 0) {
- return;
- }
switch (size) {
case 1:
esp_pdma_write(s, val);
- s->pdma_len--;
- dmalen--;
break;
case 2:
esp_pdma_write(s, val >> 8);
esp_pdma_write(s, val);
- s->pdma_len -= 2;
- dmalen -= 2;
break;
}
- esp_set_tc(s, dmalen);
if (s->pdma_len == 0 && s->pdma_cb) {
esp_lower_drq(s);
s->pdma_cb(s);
@@ -988,17 +1006,13 @@ static uint64_t sysbus_esp_pdma_read(void *opaque,
hwaddr addr,
switch (size) {
case 1:
val = esp_pdma_read(s);
- s->pdma_len--;
- dmalen--;
break;
case 2:
val = esp_pdma_read(s);
val = (val << 8) | esp_pdma_read(s);
- s->pdma_len -= 2;
- dmalen -= 2;
break;
}
- esp_set_tc(s, dmalen);
+ dmalen = esp_get_tc(s);
if (dmalen == 0 || (s->pdma_len == 0 && s->pdma_cb)) {
esp_lower_drq(s);
s->pdma_cb(s);
--
2.20.1
- [PULL 07/42] esp: add PDMA trace events, (continued)
- [PULL 07/42] esp: add PDMA trace events, Mark Cave-Ayland, 2021/03/07
- [PULL 08/42] esp: determine transfer direction directly from SCSI phase, Mark Cave-Ayland, 2021/03/07
- [PULL 09/42] esp: introduce esp_get_tc() and esp_set_tc(), Mark Cave-Ayland, 2021/03/07
- [PULL 10/42] esp: introduce esp_get_stc(), Mark Cave-Ayland, 2021/03/07
- [PULL 11/42] esp: apply transfer length adjustment when STC is zero at TC load time, Mark Cave-Ayland, 2021/03/07
- [PULL 12/42] esp: remove dma_counter from ESPState, Mark Cave-Ayland, 2021/03/07
- [PULL 13/42] esp: remove dma_left from ESPState, Mark Cave-Ayland, 2021/03/07
- [PULL 14/42] esp: remove minlen restriction in handle_ti, Mark Cave-Ayland, 2021/03/07
- [PULL 15/42] esp: introduce esp_pdma_read() and esp_pdma_write() functions, Mark Cave-Ayland, 2021/03/07
- [PULL 16/42] esp: use pdma_origin directly in esp_pdma_read()/esp_pdma_write(), Mark Cave-Ayland, 2021/03/07
- [PULL 17/42] esp: move pdma_len and TC logic into esp_pdma_read()/esp_pdma_write(),
Mark Cave-Ayland <=
- [PULL 18/42] esp: accumulate SCSI commands for PDMA transfers in cmdbuf instead of pdma_buf, Mark Cave-Ayland, 2021/03/07
- [PULL 19/42] esp: remove buf parameter from do_cmd(), Mark Cave-Ayland, 2021/03/07
- [PULL 20/42] esp: remove the buf and buflen parameters from get_cmd(), Mark Cave-Ayland, 2021/03/07
- [PULL 21/42] esp: remove redundant pdma_start from ESPState, Mark Cave-Ayland, 2021/03/07
- [PULL 22/42] esp: move PDMA length adjustments into esp_pdma_read()/esp_pdma_write(), Mark Cave-Ayland, 2021/03/07
- [PULL 23/42] esp: use ti_wptr/ti_rptr to manage the current FIFO position for PDMA, Mark Cave-Ayland, 2021/03/07
- [PULL 24/42] esp: use in-built TC to determine PDMA transfer length, Mark Cave-Ayland, 2021/03/07
- [PULL 25/42] esp: remove CMD pdma_origin, Mark Cave-Ayland, 2021/03/07
- [PULL 26/42] esp: rename get_cmd_cb() to esp_select(), Mark Cave-Ayland, 2021/03/07
- [PULL 28/42] esp: use FIFO for PDMA transfers between initiator and device, Mark Cave-Ayland, 2021/03/07