Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-16 06:43:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

esp: use ti_wptr/ti_rptr to manage the current FIFO position for PDMA

Browse Source 
This eliminates the last user of the PDMA-specific pdma_cur variable which can
now be removed.

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-24-mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2021-03-04 22:10:44 +00:00
parent 93efe2e624
commit ad7f468c42
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/scsi/esp.c
View File

@ -127,11 +127,9 @@ static uint32_t esp_get_stc(ESPState *s)
return dmalen; return dmalen;
} }
static void set_pdma(ESPState *s, enum pdma_origin_id origin, static void set_pdma(ESPState *s, enum pdma_origin_id origin, uint32_t len)
uint32_t index, uint32_t len)
{ {
s->pdma_origin = origin; s->pdma_origin = origin;
s->pdma_cur = index;
s->pdma_len = len; s->pdma_len = len;
} }
@ -146,11 +144,10 @@ static uint8_t esp_pdma_read(ESPState *s)
switch (s->pdma_origin) { switch (s->pdma_origin) {
case TI: case TI:
val = s->ti_buf[s->pdma_cur++]; val = s->ti_buf[s->ti_rptr++];
break; break;
case CMD: case CMD:
val = s->cmdbuf[s->cmdlen++]; val = s->cmdbuf[s->cmdlen++];
s->pdma_cur++;
break; break;
case ASYNC: case ASYNC:
val = s->async_buf[0]; val = s->async_buf[0];
@ -158,7 +155,6 @@ static uint8_t esp_pdma_read(ESPState *s)
s->async_len--; s->async_len--;
s->async_buf++; s->async_buf++;
} }
s->pdma_cur++;
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
@ -182,11 +178,10 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
switch (s->pdma_origin) { switch (s->pdma_origin) {
case TI: case TI:
s->ti_buf[s->pdma_cur++] = val; s->ti_buf[s->ti_wptr++] = val;
break; break;
case CMD: case CMD:
s->cmdbuf[s->cmdlen++] = val; s->cmdbuf[s->cmdlen++] = val;
s->pdma_cur++;
break; break;
case ASYNC: case ASYNC:
s->async_buf[0] = val; s->async_buf[0] = val;
@ -194,7 +189,6 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
s->async_len--; s->async_len--;
s->async_buf++; s->async_buf++;
} }
s->pdma_cur++;
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
@ -249,7 +243,7 @@ static uint32_t get_cmd(ESPState *s)
if (s->dma_memory_read) { if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, buf, dmalen); s->dma_memory_read(s->dma_opaque, buf, dmalen);
} else { } else {
set_pdma(s, CMD, 0, dmalen); set_pdma(s, CMD, dmalen);
esp_raise_drq(s); esp_raise_drq(s);
return 0; return 0;
} }
@ -412,7 +406,7 @@ static void write_response(ESPState *s)
s->rregs[ESP_RINTR] = INTR_BS | INTR_FC; s->rregs[ESP_RINTR] = INTR_BS | INTR_FC;
s->rregs[ESP_RSEQ] = SEQ_CD; s->rregs[ESP_RSEQ] = SEQ_CD;
} else { } else {
set_pdma(s, TI, 0, 2); set_pdma(s, TI, 2);
s->pdma_cb = write_response_pdma_cb; s->pdma_cb = write_response_pdma_cb;
esp_raise_drq(s); esp_raise_drq(s);
return; return;
@ -480,7 +474,7 @@ static void esp_do_dma(ESPState *s)
if (s->dma_memory_read) { if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, &s->cmdbuf[s->cmdlen], len); s->dma_memory_read(s->dma_opaque, &s->cmdbuf[s->cmdlen], len);
} else { } else {
set_pdma(s, CMD, s->cmdlen, len); set_pdma(s, CMD, len);
s->pdma_cb = do_dma_pdma_cb; s->pdma_cb = do_dma_pdma_cb;
esp_raise_drq(s); esp_raise_drq(s);
return; return;
@ -503,7 +497,7 @@ static void esp_do_dma(ESPState *s)
if (s->dma_memory_read) { if (s->dma_memory_read) {
s->dma_memory_read(s->dma_opaque, s->async_buf, len); s->dma_memory_read(s->dma_opaque, s->async_buf, len);
} else { } else {
set_pdma(s, ASYNC, 0, len); set_pdma(s, ASYNC, len);
s->pdma_cb = do_dma_pdma_cb; s->pdma_cb = do_dma_pdma_cb;
esp_raise_drq(s); esp_raise_drq(s);
return; return;
@ -512,7 +506,7 @@ static void esp_do_dma(ESPState *s)
if (s->dma_memory_write) { if (s->dma_memory_write) {
s->dma_memory_write(s->dma_opaque, s->async_buf, len); s->dma_memory_write(s->dma_opaque, s->async_buf, len);
} else { } else {
set_pdma(s, ASYNC, 0, len); set_pdma(s, ASYNC, len);
s->pdma_cb = do_dma_pdma_cb; s->pdma_cb = do_dma_pdma_cb;
esp_raise_drq(s); esp_raise_drq(s);
return; return;
@ -857,7 +851,6 @@ static const VMStateDescription vmstate_esp_pdma = {
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_INT32(pdma_origin, ESPState), VMSTATE_INT32(pdma_origin, ESPState),
VMSTATE_UINT32(pdma_len, ESPState), VMSTATE_UINT32(pdma_len, ESPState),
VMSTATE_UINT32(pdma_cur, ESPState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
}; };

1
include/hw/scsi/esp.h
View File

@ -58,7 +58,6 @@ struct ESPState {
void (*dma_cb)(ESPState *s); void (*dma_cb)(ESPState *s);
int pdma_origin; int pdma_origin;
uint32_t pdma_len; uint32_t pdma_len;
uint32_t pdma_cur;
void (*pdma_cb)(ESPState *s); void (*pdma_cb)(ESPState *s);
uint8_t mig_version_id; uint8_t mig_version_id;