diff mbox series

[PULL,10/42] esp: introduce esp_get_stc()

Message ID	20210307120850.10418-11-mark.cave-ayland@ilande.co.uk
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 7 Mar 2021 12:08:18 +0000 Message-Id: <20210307120850.10418-11-mark.cave-ayland@ilande.co.uk> In-Reply-To: <20210307120850.10418-1-mark.cave-ayland@ilande.co.uk> References: <20210307120850.10418-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [PULL 10/42] esp: introduce esp_get_stc() Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/42] esp: checkpatch fixes \| expand [PULL,01/42] esp: checkpatch fixes [PULL,02/42] esp: rename existing ESP QOM type to SYSBUS_ESP [PULL,03/42] esp: QOMify the internal ESP device state [PULL,04/42] esp: add vmstate_esp version to embedded ESPState [PULL,05/42] esp: add trace event when receiving a TI command [PULL,06/42] esp: fix esp_reg_read() trace event [PULL,07/42] esp: add PDMA trace events [PULL,08/42] esp: determine transfer direction directly from SCSI phase [PULL,09/42] esp: introduce esp_get_tc() and esp_set_tc() [PULL,10/42] esp: introduce esp_get_stc() [PULL,11/42] esp: apply transfer length adjustment when STC is zero at TC load time [PULL,12/42] esp: remove dma_counter from ESPState [PULL,13/42] esp: remove dma_left from ESPState [PULL,14/42] esp: remove minlen restriction in handle_ti [PULL,15/42] esp: introduce esp_pdma_read() and esp_pdma_write() functions [PULL,16/42] esp: use pdma_origin directly in esp_pdma_read()/esp_pdma_write() [PULL,17/42] esp: move pdma_len and TC logic into esp_pdma_read()/esp_pdma_write() [PULL,18/42] esp: accumulate SCSI commands for PDMA transfers in cmdbuf instead of pdma_buf [PULL,19/42] esp: remove buf parameter from do_cmd() [PULL,20/42] esp: remove the buf and buflen parameters from get_cmd() [PULL,21/42] esp: remove redundant pdma_start from ESPState [PULL,22/42] esp: move PDMA length adjustments into esp_pdma_read()/esp_pdma_write() [PULL,23/42] esp: use ti_wptr/ti_rptr to manage the current FIFO position for PDMA [PULL,24/42] esp: use in-built TC to determine PDMA transfer length [PULL,25/42] esp: remove CMD pdma_origin [PULL,26/42] esp: rename get_cmd_cb() to esp_select() [PULL,27/42] esp: fix PDMA target selection [PULL,28/42] esp: use FIFO for PDMA transfers between initiator and device [PULL,29/42] esp: remove pdma_origin from ESPState [PULL,30/42] esp: add 4 byte PDMA read and write transfers [PULL,31/42] esp: implement FIFO flush command [PULL,32/42] esp: latch individual bits in ESP_RINTR register [PULL,33/42] esp: defer command completion interrupt on incoming data transfers [PULL,34/42] esp: remove old deferred command completion mechanism [PULL,35/42] esp: raise interrupt after every non-DMA byte transferred to the FIFO [PULL,36/42] esp: add maxlen parameter to get_cmd() [PULL,37/42] esp: transition to message out phase after SATN and stop command [PULL,38/42] esp: convert ti_buf from array to Fifo8 [PULL,39/42] esp: convert cmdbuf from array to Fifo8 [PULL,40/42] esp: add trivial implementation of the ESP_RFLAGS register [PULL,41/42] esp: implement non-DMA transfers in PDMA mode [PULL,42/42] esp: add support for unaligned accesses

Commit Message

Mark Cave-Ayland March 7, 2021, 12:08 p.m. UTC

This function simplifies reading the STC register value without having to manually
shift each individual 8-bit value.

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-11-mark.cave-ayland@ilande.co.uk>
---
 hw/scsi/esp.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index dd94f7b47b..125bdea32a 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -116,6 +116,17 @@  static void esp_set_tc(ESPState *s, uint32_t dmalen)
     s->rregs[ESP_TCHI] = dmalen >> 16;
 }
 
+static uint32_t esp_get_stc(ESPState *s)
+{
+    uint32_t dmalen;
+
+    dmalen = s->wregs[ESP_TCLO];
+    dmalen |= s->wregs[ESP_TCMID] << 8;
+    dmalen |= s->wregs[ESP_TCHI] << 16;
+
+    return dmalen;
+}
+
 static void set_pdma(ESPState *s, enum pdma_origin_id origin,
                      uint32_t index, uint32_t len)
 {
@@ -687,9 +698,7 @@  void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
         if (val & CMD_DMA) {
             s->dma = 1;
             /* Reload DMA counter.  */
-            s->rregs[ESP_TCLO] = s->wregs[ESP_TCLO];
-            s->rregs[ESP_TCMID] = s->wregs[ESP_TCMID];
-            s->rregs[ESP_TCHI] = s->wregs[ESP_TCHI];
+            esp_set_tc(s, esp_get_stc(s));
         } else {
             s->dma = 0;
         }