From nobody Tue Nov 26 12:44:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707853343204711.6082883649485; Tue, 13 Feb 2024 11:42:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyfJ-00032v-OY; Tue, 13 Feb 2024 14:42:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZyfI-00032h-ER for qemu-devel@nongnu.org; Tue, 13 Feb 2024 14:42:00 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZyf4-0006IU-Az for qemu-devel@nongnu.org; Tue, 13 Feb 2024 14:42:00 -0500 Received: from [2a00:23c4:8bb2:1300:c500:f104:bc51:e670] (helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rZyeL-0008m4-JM; Tue, 13 Feb 2024 19:41:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Je02mCt9XBjHhIXM7fupKVBJ602KX1m94ilxNmva87w=; b=pOuVa6oOtld+VfaUHapNCxb59z 2JQVw6NLMxvzM/j9zqsHcLGqNC1b6++Fb6PLSTMWm+tYWWnBHwkTlUgb8aUtc1KXLDmd/IC7pCJ0P 0DaIKLRjE7KAH7jPhry1qilDzmH5fPtt642IilANomknFk3y4eq9/yj2NVeZv1fuh5eIwe+trrqjW iivYJ3/WYZfKSt05vLQUP8ZRqykg3fdSRYUGFBZ7JOTo6F9fhM8fK21CN9ArOREgKgKM50T7ITJBp fFPpP/HRSqvMrzJqzWYmovv+im4tFg1fd+fMa20V9e/vcT9uH07BL2NiFSYl3s79cPOLy8vhgcPCV Dxd/W7sQV2trGsgacvgasRz3uNNdUtk6boGNQaIrZfuXcWYesDSRLYfL92PMeh5HC2627qEjcIgBY gZ3f701u89i7pzgDu94scvocp5z7AygVezstWI7xO56H3JOG/vR07SsVKJh5cWCiLJ1CQqiDHoI6A EgqHCczt2M4QYYaN0sLs8jOY01XQOchpowSJTNmvgmWi6ADZA649hfT3rtKsh7gHROyrXFiBKJ4Hk MPDzclocFN551/E4eWLfXwjTbKEuY7NQmG45ut/2f9B/rf3/+0fd4IyNSmJSzeNN3+gvr78dNGEjZ jny2oGichW4glAgFU9RpQGRb0SakWjYTdjrJelGhg=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Tue, 13 Feb 2024 19:39:36 +0000 Message-Id: <20240213194052.1162753-13-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240213194052.1162753-1-mark.cave-ayland@ilande.co.uk> References: <20240213194052.1162753-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bb2:1300:c500:f104:bc51:e670 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 12/88] esp.c: don't accumulate directly into cmdfifo X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1707853344966100003 Content-Type: text/plain; charset="utf-8" Instead accumulate in the real FIFO as done in real hardware, and then tran= sfer to cmdfifo when we're ready to process the MESSAGE OUT and COMMAND phase da= ta. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-13-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 6191c17f10..9e9bbe8431 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -199,11 +199,7 @@ static void esp_pdma_write(ESPState *s, uint8_t val) return; } =20 - if (s->do_cmd) { - esp_fifo_push(&s->cmdfifo, val); - } else { - esp_fifo_push(&s->fifo, val); - } + esp_fifo_push(&s->fifo, val); =20 dmalen--; esp_set_tc(s, dmalen); @@ -358,6 +354,14 @@ static void do_cmd(ESPState *s) =20 static void satn_pdma_cb(ESPState *s) { + uint8_t buf[ESP_FIFO_SZ]; + int n; + + /* Copy FIFO into cmdfifo */ + n =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo)); + n =3D MIN(fifo8_num_free(&s->cmdfifo), n); + fifo8_push_all(&s->cmdfifo, buf, n); + if (!esp_get_tc(s) && !fifo8_is_empty(&s->cmdfifo)) { s->cmdfifo_cdb_offset =3D 1; s->do_cmd =3D 0; @@ -395,6 +399,14 @@ static void handle_satn(ESPState *s) =20 static void s_without_satn_pdma_cb(ESPState *s) { + uint8_t buf[ESP_FIFO_SZ]; + int n; + + /* Copy FIFO into cmdfifo */ + n =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo)); + n =3D MIN(fifo8_num_free(&s->cmdfifo), n); + fifo8_push_all(&s->cmdfifo, buf, n); + if (!esp_get_tc(s) && !fifo8_is_empty(&s->cmdfifo)) { s->cmdfifo_cdb_offset =3D 0; s->do_cmd =3D 0; @@ -432,6 +444,14 @@ static void handle_s_without_atn(ESPState *s) =20 static void satn_stop_pdma_cb(ESPState *s) { + uint8_t buf[ESP_FIFO_SZ]; + int n; + + /* Copy FIFO into cmdfifo */ + n =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo)); + n =3D MIN(fifo8_num_free(&s->cmdfifo), n); + fifo8_push_all(&s->cmdfifo, buf, n); + if (!esp_get_tc(s) && !fifo8_is_empty(&s->cmdfifo)) { trace_esp_handle_satn_stop(fifo8_num_used(&s->cmdfifo)); s->do_cmd =3D 1; @@ -523,10 +543,16 @@ static void esp_dma_done(ESPState *s) static void do_dma_pdma_cb(ESPState *s) { int to_device =3D ((s->rregs[ESP_RSTAT] & 7) =3D=3D STAT_DO); + uint8_t buf[ESP_CMDFIFO_SZ]; int len; uint32_t n; =20 if (s->do_cmd) { + /* Copy FIFO into cmdfifo */ + n =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo)); + n =3D MIN(fifo8_num_free(&s->cmdfifo), n); + fifo8_push_all(&s->cmdfifo, buf, n); + /* Ensure we have received complete command after SATN and stop */ if (esp_get_tc(s) || fifo8_is_empty(&s->cmdfifo)) { return; @@ -754,10 +780,16 @@ static void esp_do_dma(ESPState *s) static void esp_do_nodma(ESPState *s) { int to_device =3D ((s->rregs[ESP_RSTAT] & 7) =3D=3D STAT_DO); + uint8_t buf[ESP_FIFO_SZ]; uint32_t cmdlen; - int len; + int len, n; =20 if (s->do_cmd) { + /* Copy FIFO into cmdfifo */ + n =3D esp_fifo_pop_buf(&s->fifo, buf, fifo8_num_used(&s->fifo)); + n =3D MIN(fifo8_num_free(&s->cmdfifo), n); + fifo8_push_all(&s->cmdfifo, buf, n); + cmdlen =3D fifo8_num_used(&s->cmdfifo); trace_esp_handle_ti_cmd(cmdlen); s->ti_size =3D 0; @@ -1159,7 +1191,10 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint= 64_t val) break; case ESP_FIFO: if (s->do_cmd) { - esp_fifo_push(&s->cmdfifo, val); + if (!fifo8_is_full(&s->fifo)) { + esp_fifo_push(&s->fifo, val); + esp_fifo_push(&s->cmdfifo, fifo8_pop(&s->fifo)); + } =20 /* * If any unexpected message out/command phase data is --=20 2.39.2