diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 15c4c33052..92fea6a8c4 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -228,7 +228,7 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t busid)
s->ti_size = datalen;
if (datalen != 0) {
s->rregs[ESP_RSTAT] = STAT_TC;
- s->dma_left = 0;
+ esp_set_tc(s, 0);
if (datalen > 0) {
s->rregs[ESP_RSTAT] |= STAT_DI;
} else {
@@ -382,6 +382,7 @@ static void do_dma_pdma_cb(ESPState *s)
{
int to_device = ((s->rregs[ESP_RSTAT] & 7) == STAT_DO);
int len = s->pdma_cur - s->pdma_start;
+
if (s->do_cmd) {
s->ti_size = 0;
s->cmdlen = 0;
@@ -389,7 +390,6 @@ static void do_dma_pdma_cb(ESPState *s)
do_cmd(s, s->cmdbuf);
return;
}
- s->dma_left -= len;
s->async_buf += len;
s->async_len -= len;
if (to_device) {
@@ -404,7 +404,7 @@ static void do_dma_pdma_cb(ESPState *s)
* complete the DMA operation immediately. Otherwise defer
* until the scsi layer has completed.
*/
- if (to_device || s->dma_left != 0 || s->ti_size == 0) {
+ if (to_device || esp_get_tc(s) != 0 || s->ti_size == 0) {
return;
}
}
@@ -418,7 +418,7 @@ static void esp_do_dma(ESPState *s)
uint32_t len;
int to_device = ((s->rregs[ESP_RSTAT] & 7) == STAT_DO);
- len = s->dma_left;
+ len = esp_get_tc(s);
if (s->do_cmd) {
/*
* handle_ti_cmd() case: esp_do_dma() is called only from
@@ -468,7 +468,7 @@ static void esp_do_dma(ESPState *s)
return;
}
}
- s->dma_left -= len;
+ esp_set_tc(s, esp_get_tc(s) - len);
s->async_buf += len;
s->async_len -= len;
if (to_device) {
@@ -483,7 +483,7 @@ static void esp_do_dma(ESPState *s)
* complete the DMA operation immediately. Otherwise defer
* until the scsi layer has completed.
*/
- if (to_device || s->dma_left != 0 || s->ti_size == 0) {
+ if (to_device || esp_get_tc(s) != 0 || s->ti_size == 0) {
return;
}
}
@@ -499,7 +499,6 @@ static void esp_report_command_complete(ESPState *s, uint32_t status)
trace_esp_command_complete_unexpected();
}
s->ti_size = 0;
- s->dma_left = 0;
s->async_len = 0;
if (status) {
trace_esp_command_complete_fail();
@@ -534,12 +533,13 @@ void esp_command_complete(SCSIRequest *req, size_t resid)
void esp_transfer_data(SCSIRequest *req, uint32_t len)
{
ESPState *s = req->hba_private;
+ uint32_t dmalen = esp_get_tc(s);
assert(!s->do_cmd);
- trace_esp_transfer_data(s->dma_left, s->ti_size);
+ trace_esp_transfer_data(dmalen, s->ti_size);
s->async_len = len;
s->async_buf = scsi_req_get_buf(req);
- if (s->dma_left) {
+ if (dmalen) {
esp_do_dma(s);
} else if (s->ti_size <= 0) {
/*
@@ -570,7 +570,6 @@ static void handle_ti(ESPState *s)
}
trace_esp_handle_ti(minlen);
if (s->dma) {
- s->dma_left = minlen;
s->rregs[ESP_RSTAT] &= ~STAT_TC;
esp_do_dma(s);
} else if (s->do_cmd) {
@@ -823,6 +822,14 @@ static const VMStateDescription vmstate_esp_pdma = {
}
};
+static bool esp_is_before_version_5(void *opaque, int version_id)
+{
+ ESPState *s = ESP(opaque);
+
+ version_id = MIN(version_id, s->mig_version_id);
+ return version_id < 5;
+}
+
static int esp_pre_save(void *opaque)
{
ESPState *s = ESP(opaque);
@@ -835,6 +842,12 @@ static int esp_post_load(void *opaque, int version_id)
{
ESPState *s = ESP(opaque);
+ version_id = MIN(version_id, s->mig_version_id);
+
+ if (version_id < 5) {
+ esp_set_tc(s, s->mig_dma_left);
+ }
+
s->mig_version_id = vmstate_esp.version_id;
return 0;
}
@@ -860,7 +873,7 @@ const VMStateDescription vmstate_esp = {
VMSTATE_BUFFER_START_MIDDLE_V(cmdbuf, ESPState, 16, 4),
VMSTATE_UINT32(cmdlen, ESPState),
VMSTATE_UINT32(do_cmd, ESPState),
- VMSTATE_UINT32(dma_left, ESPState),
+ VMSTATE_UINT32_TEST(mig_dma_left, ESPState, esp_is_before_version_5),
VMSTATE_END_OF_LIST()
},
.subsections = (const VMStateDescription * []) {
@@ -903,12 +916,11 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr addr,
{
SysBusESPState *sysbus = opaque;
ESPState *s = ESP(&sysbus->esp);
- uint32_t dmalen;
+ uint32_t dmalen = esp_get_tc(s);
uint8_t *buf = get_pdma_buf(s);
trace_esp_pdma_write(size);
- dmalen = esp_get_tc(s);
if (dmalen == 0 || s->pdma_len == 0) {
return;
}
@@ -938,27 +950,30 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, hwaddr addr,
{
SysBusESPState *sysbus = opaque;
ESPState *s = ESP(&sysbus->esp);
+ uint32_t dmalen = esp_get_tc(s);
uint8_t *buf = get_pdma_buf(s);
uint64_t val = 0;
trace_esp_pdma_read(size);
- if (s->pdma_len == 0) {
+ if (dmalen == 0 || s->pdma_len == 0) {
return 0;
}
switch (size) {
case 1:
val = buf[s->pdma_cur++];
s->pdma_len--;
+ dmalen--;
break;
case 2:
val = buf[s->pdma_cur++];
val = (val << 8) | buf[s->pdma_cur++];
s->pdma_len -= 2;
+ dmalen -= 2;
break;
}
-
- if (s->pdma_len == 0 && s->pdma_cb) {
+ esp_set_tc(s, dmalen);
+ if (dmalen == 0 || (s->pdma_len == 0 && s->pdma_cb)) {
esp_lower_drq(s);
s->pdma_cb(s);
s->pdma_cb = NULL;
diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h
index ff1372947b..ff50c9e7d8 100644
--- a/include/hw/scsi/esp.h
+++ b/include/hw/scsi/esp.h
@@ -48,8 +48,6 @@ struct ESPState {
uint32_t cmdlen;
uint32_t do_cmd;
- /* The amount of data left in the current DMA transfer. */
- uint32_t dma_left;
int dma_enabled;
uint32_t async_len;
@@ -67,6 +65,9 @@ struct ESPState {
void (*pdma_cb)(ESPState *s);
uint8_t mig_version_id;
+
+ /* Legacy fields for vmstate_esp version < 5 */
+ uint32_t mig_dma_left;
};
#define TYPE_SYSBUS_ESP "sysbus-esp"