commit 60c572502cbb89f1f46c2127794f956220e5dbab
author Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Sun Mar 24 19:17:05 2024 +0000
committer Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Thu Apr 04 15:17:53 2024 +0100
tree f3d601b1c6e4ab8bcd7569cffc47fd77b75b597e
parent ffa3a5f2bedb2cdd7fb1c5c0f6702fd6eb0f5962

esp.c: ensure esp_pdma_write() always calls esp_fifo_push()

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

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 4895181..04dfd90 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -282,14 +282,12 @@
 {
     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)