[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 12/42] esp: remove dma_counter from ESPState
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 12/42] esp: remove dma_counter from ESPState |
Date: |
Thu, 4 Mar 2021 22:10:33 +0000 |
The value of dma_counter is set once at the start of the transfer and remains
the same until the transfer is complete. This allows the check in
esp_transfer_data
to be simplified since dma_left will always be non-zero until the transfer is
completed.
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>
---
hw/scsi/esp.c | 4 +---
include/hw/scsi/esp.h | 3 ---
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 349067eb6a..15c4c33052 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -229,7 +229,6 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t
busid)
if (datalen != 0) {
s->rregs[ESP_RSTAT] = STAT_TC;
s->dma_left = 0;
- s->dma_counter = 0;
if (datalen > 0) {
s->rregs[ESP_RSTAT] |= STAT_DI;
} else {
@@ -542,7 +541,7 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len)
s->async_buf = scsi_req_get_buf(req);
if (s->dma_left) {
esp_do_dma(s);
- } else if (s->dma_counter != 0 && s->ti_size <= 0) {
+ } else if (s->ti_size <= 0) {
/*
* If this was the last part of a DMA transfer then the
* completion interrupt is deferred to here.
@@ -561,7 +560,6 @@ static void handle_ti(ESPState *s)
}
dmalen = esp_get_tc(s);
- s->dma_counter = dmalen;
if (s->do_cmd) {
minlen = (dmalen < ESP_CMDBUF_SZ) ? dmalen : ESP_CMDBUF_SZ;
diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h
index 9d149cbc9f..ff1372947b 100644
--- a/include/hw/scsi/esp.h
+++ b/include/hw/scsi/esp.h
@@ -50,9 +50,6 @@ struct ESPState {
/* The amount of data left in the current DMA transfer. */
uint32_t dma_left;
- /* The size of the current DMA transfer. Zero if no transfer is in
- progress. */
- uint32_t dma_counter;
int dma_enabled;
uint32_t async_len;
--
2.20.1
- [PATCH v3 02/42] esp: rename existing ESP QOM type to SYSBUS_ESP, (continued)
- [PATCH v3 02/42] esp: rename existing ESP QOM type to SYSBUS_ESP, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 03/42] esp: QOMify the internal ESP device state, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 04/42] esp: add vmstate_esp version to embedded ESPState, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 05/42] esp: add trace event when receiving a TI command, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 06/42] esp: fix esp_reg_read() trace event, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 07/42] esp: add PDMA trace events, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 08/42] esp: determine transfer direction directly from SCSI phase, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 09/42] esp: introduce esp_get_tc() and esp_set_tc(), Mark Cave-Ayland, 2021/03/04
- [PATCH v3 10/42] esp: introduce esp_get_stc(), Mark Cave-Ayland, 2021/03/04
- [PATCH v3 11/42] esp: apply transfer length adjustment when STC is zero at TC load time, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 12/42] esp: remove dma_counter from ESPState,
Mark Cave-Ayland <=
- [PATCH v3 13/42] esp: remove dma_left from ESPState, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 14/42] esp: remove minlen restriction in handle_ti, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 15/42] esp: introduce esp_pdma_read() and esp_pdma_write() functions, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 16/42] esp: use pdma_origin directly in esp_pdma_read()/esp_pdma_write(), Mark Cave-Ayland, 2021/03/04
- [PATCH v3 17/42] esp: move pdma_len and TC logic into esp_pdma_read()/esp_pdma_write(), Mark Cave-Ayland, 2021/03/04
- [PATCH v3 18/42] esp: accumulate SCSI commands for PDMA transfers in cmdbuf instead of pdma_buf, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 19/42] esp: remove buf parameter from do_cmd(), Mark Cave-Ayland, 2021/03/04
- [PATCH v3 20/42] esp: remove the buf and buflen parameters from get_cmd(), Mark Cave-Ayland, 2021/03/04
- [PATCH v3 21/42] esp: remove redundant pdma_start from ESPState, Mark Cave-Ayland, 2021/03/04
- [PATCH v3 22/42] esp: move PDMA length adjustments into esp_pdma_read()/esp_pdma_write(), Mark Cave-Ayland, 2021/03/04