[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/17] esp.c: ensure esp_pdma_write() always calls esp_fifo_push()
From: |
Mark Cave-Ayland |
Subject: |
[PULL 16/17] esp.c: ensure esp_pdma_write() always calls esp_fifo_push() |
Date: |
Thu, 4 Apr 2024 15:25:38 +0100 |
This ensures that esp_update_drq() is called via esp_fifo_push() whenever the
host uses PDMA to transfer data to a SCSI device.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20240324191707.623175-17-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 4895181ec1..04dfd90090 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -282,14 +282,12 @@ static void esp_pdma_write(ESPState *s, uint8_t val)
{
uint32_t dmalen = esp_get_tc(s);
- if (dmalen == 0) {
- return;
- }
-
esp_fifo_push(s, val);
- dmalen--;
- esp_set_tc(s, dmalen);
+ if (dmalen && s->drq_state) {
+ dmalen--;
+ esp_set_tc(s, dmalen);
+ }
}
static int esp_select(ESPState *s)
--
2.39.2
- [PULL 05/17] esp.c: change esp_fifo_push() to take ESPState, (continued)
- [PULL 05/17] esp.c: change esp_fifo_push() to take ESPState, Mark Cave-Ayland, 2024/04/04
- [PULL 06/17] esp.c: change esp_fifo_pop() to take ESPState, Mark Cave-Ayland, 2024/04/04
- [PULL 07/17] esp.c: use esp_fifo_push() instead of fifo8_push(), Mark Cave-Ayland, 2024/04/04
- [PULL 08/17] esp.c: change esp_fifo_pop_buf() to take ESPState, Mark Cave-Ayland, 2024/04/04
- [PULL 09/17] esp.c: introduce esp_fifo_push_buf() function for pushing to the FIFO, Mark Cave-Ayland, 2024/04/04
- [PULL 10/17] esp.c: don't assert() if FIFO empty when executing non-DMA SELATNS, Mark Cave-Ayland, 2024/04/04
- [PULL 11/17] esp.c: rework esp_cdb_length() into esp_cdb_ready(), Mark Cave-Ayland, 2024/04/04
- [PULL 12/17] esp.c: prevent cmdfifo overflow in esp_cdb_ready(), Mark Cave-Ayland, 2024/04/04
- [PULL 13/17] esp.c: move esp_set_phase() and esp_get_phase() towards the beginning of the file, Mark Cave-Ayland, 2024/04/04
- [PULL 14/17] esp.c: introduce esp_update_drq() and update esp_fifo_{push, pop}_buf() to use it, Mark Cave-Ayland, 2024/04/04
- [PULL 16/17] esp.c: ensure esp_pdma_write() always calls esp_fifo_push(),
Mark Cave-Ayland <=
- [PULL 15/17] esp.c: update esp_fifo_{push, pop}() to call esp_update_drq(), Mark Cave-Ayland, 2024/04/04
- [PULL 17/17] esp.c: remove explicit setting of DRQ within ESP state machine, Mark Cave-Ayland, 2024/04/04
- Re: [PULL 00/17] qemu-sparc queue 20240404, Peter Maydell, 2024/04/04