[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 22/42] esp: move PDMA length adjustments into esp_pdma_read()/
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v2 22/42] esp: move PDMA length adjustments into esp_pdma_read()/esp_pdma_write() |
Date: |
Tue, 9 Feb 2021 19:29:58 +0000 |
Here the updates to async_len and ti_size are moved into the corresponding
esp_pdma_read()/esp_pdma_write() function to eliminate the reference to
pdma_cur in do_dma_pdma_cb().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 91f65a5d9b..691a2f4bdc 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -153,12 +153,18 @@ static uint8_t esp_pdma_read(ESPState *s)
s->pdma_cur++;
break;
case ASYNC:
- val = s->async_buf[s->pdma_cur++];
+ val = s->async_buf[0];
+ if (s->async_len > 0) {
+ s->async_len--;
+ s->async_buf++;
+ }
+ s->pdma_cur++;
break;
default:
g_assert_not_reached();
}
+ s->ti_size--;
s->pdma_len--;
dmalen--;
esp_set_tc(s, dmalen);
@@ -183,12 +189,18 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
s->pdma_cur++;
break;
case ASYNC:
- s->async_buf[s->pdma_cur++] = val;
+ s->async_buf[0] = val;
+ if (s->async_len > 0) {
+ s->async_len--;
+ s->async_buf++;
+ }
+ s->pdma_cur++;
break;
default:
g_assert_not_reached();
}
+ s->ti_size++;
s->pdma_len--;
dmalen--;
esp_set_tc(s, dmalen);
@@ -427,7 +439,6 @@ static void esp_dma_done(ESPState *s)
static void do_dma_pdma_cb(ESPState *s)
{
int to_device = ((s->rregs[ESP_RSTAT] & 7) == STAT_DO);
- int len = s->pdma_cur;
if (s->do_cmd) {
s->ti_size = 0;
@@ -436,13 +447,6 @@ static void do_dma_pdma_cb(ESPState *s)
do_cmd(s);
return;
}
- s->async_buf += len;
- s->async_len -= len;
- if (to_device) {
- s->ti_size += len;
- } else {
- s->ti_size -= len;
- }
if (s->async_len == 0) {
scsi_req_continue(s->current_req);
/*
--
2.20.1
- Re: [PATCH v2 17/42] esp: move pdma_len and TC logic into esp_pdma_read()/esp_pdma_write(), (continued)
- [PATCH v2 18/42] esp: accumulate SCSI commands for PDMA transfers in cmdbuf instead of pdma_buf, Mark Cave-Ayland, 2021/02/09
- [PATCH v2 19/42] esp: remove buf parameter from do_cmd(), Mark Cave-Ayland, 2021/02/09
- [PATCH v2 20/42] esp: remove the buf and buflen parameters from get_cmd(), Mark Cave-Ayland, 2021/02/09
- [PATCH v2 21/42] esp: remove redundant pdma_start from ESPState, Mark Cave-Ayland, 2021/02/09
- [PATCH v2 24/42] esp: use in-built TC to determine PDMA transfer length, Mark Cave-Ayland, 2021/02/09
- [PATCH v2 22/42] esp: move PDMA length adjustments into esp_pdma_read()/esp_pdma_write(),
Mark Cave-Ayland <=
- [PATCH v2 23/42] esp: use ti_wptr/ti_rptr to manage the current FIFO position for PDMA, Mark Cave-Ayland, 2021/02/09
- [PATCH v2 25/42] esp: remove CMD pdma_origin, Mark Cave-Ayland, 2021/02/09
- [PATCH v2 26/42] esp: rename get_cmd_cb() to esp_select(), Mark Cave-Ayland, 2021/02/09
- [PATCH v2 27/42] esp: fix PDMA target selection, Mark Cave-Ayland, 2021/02/09
- [PATCH v2 28/42] esp: use FIFO for PDMA transfers between initiator and device, Mark Cave-Ayland, 2021/02/09
- [PATCH v2 29/42] esp: remove pdma_origin from ESPState, Mark Cave-Ayland, 2021/02/09
- [PATCH v2 30/42] esp: add 4 byte PDMA read and write transfers, Mark Cave-Ayland, 2021/02/09