From nobody Sat Sep 21 07:46:05 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 1705065001493723.2481890010309; Fri, 12 Jan 2024 05:10:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOHDs-0006gW-B7; Fri, 12 Jan 2024 08:05:20 -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 1rOHDW-0004qi-U0 for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:05:01 -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 1rOHDU-0003ES-7S for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:04:58 -0500 Received: from [2a02:8012:c93d:0:260e:bf57:a4e9:8142] (helo=cheesecake.fritz.box) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rOH6O-0008jM-Vm; Fri, 12 Jan 2024 12:57:38 +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=eUl8FFsRu9UjNl2mOZKaUEzOkTe6mvJkj3P/yeaifIE=; b=Fd7lVGPA2cdPTb67qePUBGa2Q/ No+8Dl1s3zkJRZphUZV61CRojl28LkXtwP0V6o939muTpU3PuOj47yu6YIpYuVtsdvkZp23pf/z9H IVv7VuAv3/KjYA3nyD1i9VqGebN1Eu/ET+SMzQyX4NP5yYDgILOYbp8gz5Rca5/N5si5BWXKogK3T GHf//WHFPjJqOrkjJMwNONHRa4cOTomNrxoAYcK/r/chCKj1H/Qqrb4KRDn+kvm655PxQxN5pLW3A UROlFxLh3AH46DsiFi5lqCcWHj8zWyWKQCNdb4PKUNC8oD/Rk55iG5YH65A9QzumqMi8CrLma/Vcw IdJobleV2ZKAL875uYltXiMt7FaeM3tbWhv7SJ1TlEumDKTHjhUaVgWNbXYhrW7AB64BRBmQRSEbP uTHWP7aMmtY4DjnB/stJ5+no9nBA4yjjt2H9S5/Fw7BiwxGHJlrnEcNW+29zjhM1/ybV7nD+1FnSq gYIotgnn+TZbHt2mI97cmahxvlkdCJM3HygNtako0yZv5ngZzUn+YUaCUXHZikmZ4xZJuFx641s3z WaoGTR8c8iZBzZJF8q9swNqpWufdD76Q3COemQQt+9bgiTiMxYec3ssnLh+f1fxVgyOz/N91wXCdK Kjw7tOlP+UUX2kewnsgpV539y9oFzcSyj+1kCJIms=; From: Mark Cave-Ayland To: pbonzini@redhat.com, fam@euphon.net, hpoussin@reactos.org, laurent@vivier.eu, thuth@redhat.com, qemu-devel@nongnu.org Date: Fri, 12 Jan 2024 12:53:59 +0000 Message-Id: <20240112125420.514425-68-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240112125420.514425-1-mark.cave-ayland@ilande.co.uk> References: <20240112125420.514425-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a02:8012:c93d:0:260e:bf57:a4e9:8142 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 67/88] esp.c: replace get_cmd() with esp_do_nodma() 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: 1705065003115100001 Content-Type: text/plain; charset="utf-8" Now that the esp_do_nodma() state machine correctly handles incoming FIFO data, all remaining users of get_cmd() can be replaced with esp_do_nodma() and the get_cmd() function removed completely. Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 54 ++++----------------------------------------------- 1 file changed, 4 insertions(+), 50 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 5bb8cc4ea7..277eb8647b 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -257,40 +257,6 @@ static int esp_select(ESPState *s) static void esp_do_dma(ESPState *s); static void esp_do_nodma(ESPState *s); =20 -static uint32_t get_cmd(ESPState *s, uint32_t maxlen) -{ - uint8_t buf[ESP_CMDFIFO_SZ]; - uint32_t dmalen, n; - int target; - - target =3D s->wregs[ESP_WBUSID] & BUSID_DID; - if (s->dma) { - dmalen =3D MIN(esp_get_tc(s), maxlen); - if (dmalen =3D=3D 0) { - return 0; - } - if (s->dma_memory_read) { - s->dma_memory_read(s->dma_opaque, buf, dmalen); - dmalen =3D MIN(fifo8_num_free(&s->cmdfifo), dmalen); - fifo8_push_all(&s->cmdfifo, buf, dmalen); - esp_set_tc(s, esp_get_tc(s) - dmalen); - } else { - return 0; - } - } else { - dmalen =3D MIN(fifo8_num_used(&s->fifo), maxlen); - if (dmalen =3D=3D 0) { - return 0; - } - n =3D esp_fifo_pop_buf(&s->fifo, buf, dmalen); - n =3D MIN(fifo8_num_free(&s->cmdfifo), n); - fifo8_push_all(&s->cmdfifo, buf, n); - } - trace_esp_get_cmd(dmalen, target); - - return dmalen; -} - static void do_command_phase(ESPState *s) { uint32_t cmdlen; @@ -376,10 +342,7 @@ static void handle_satn(ESPState *s) if (s->dma) { esp_do_dma(s); } else { - if (get_cmd(s, ESP_CMDFIFO_SZ)) { - s->cmdfifo_cdb_offset =3D 1; - do_cmd(s); - } + esp_do_nodma(s); } } =20 @@ -401,9 +364,7 @@ static void handle_s_without_atn(ESPState *s) if (s->dma) { esp_do_dma(s); } else { - if (get_cmd(s, ESP_CMDFIFO_SZ)) { - do_cmd(s); - } + esp_do_nodma(s); } } =20 @@ -425,14 +386,7 @@ static void handle_satn_stop(ESPState *s) if (s->dma) { esp_do_dma(s); } else { - if (get_cmd(s, 1)) { - trace_esp_handle_satn_stop(fifo8_num_used(&s->cmdfifo)); - - /* Raise command completion interrupt */ - s->rregs[ESP_RINTR] |=3D INTR_BS | INTR_FC; - s->rregs[ESP_RSEQ] =3D SEQ_MO; - esp_raise_irq(s); - } + esp_do_nodma(s); } } =20 @@ -770,7 +724,7 @@ static void esp_do_nodma(ESPState *s) break; =20 case CMD_SELATNS: - if (fifo8_num_used(&s->cmdfifo) =3D=3D 1) { + if (fifo8_num_used(&s->cmdfifo) >=3D 1) { /* First byte received, stop in message out phase */ s->cmdfifo_cdb_offset =3D 1; =20 --=20 2.39.2