From nobody Fri Oct 25 19:21:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1614896535; cv=none; d=zohomail.com; s=zohoarc; b=fL/8bhnUQx4qI4FEPsF2ZOr4DGt+5CGB6vEZwk36yxTLXrDEl38GV3J8/qoIO3Sti24eBoAB8iz6kU0MSJ3Zra/U9imAwmIjjwbBjGkQS5sb1LQ1gWnPAafSiZymTyUEBxNzxT/vs+xOTRDOykm4g5gQGomGtPMdWZfpI76cbuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614896535; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JCxRDNzpLuRDXD0iIYkd5eiIrfbJzFEIYoQv70+ko/w=; b=AD73CPN7Dc85iXxdhMz63REgc4qa0Adbp7PmSm2gK3fB95/vp9YjqUH2hb9l3wiZuGXNNRHtTU4SNt+7r9jsl+h6r84EjGpFW7jbSdgvFbwwmIX2bJqPt0KPn3Y+8vALfVMLuV7viD24+9ZbKC1s7/vGylOMFFCXPYC9ndN3huU= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614896535837700.4704498607726; Thu, 4 Mar 2021 14:22:15 -0800 (PST) Received: from localhost ([::1]:32890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHwMI-0003Nk-IJ for importer@patchew.org; Thu, 04 Mar 2021 17:22:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHwDA-0006SZ-9H for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:12:48 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:40064 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHwD8-00065g-Dx for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:12:48 -0500 Received: from host86-148-34-47.range86-148.btcentralplus.com ([86.148.34.47] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lHwD0-0008MJ-Gq; Thu, 04 Mar 2021 22:12:44 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Thu, 4 Mar 2021 22:10:38 +0000 Message-Id: <20210304221103.6369-18-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210304221103.6369-1-mark.cave-ayland@ilande.co.uk> References: <20210304221103.6369-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.34.47 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 17/42] esp: move pdma_len and TC logic into esp_pdma_read()/esp_pdma_write() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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.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 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- hw/scsi/esp.c | 50 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 58be98f047..b8d1ec41e9 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -153,22 +153,45 @@ static uint8_t *get_pdma_buf(ESPState *s) =20 static uint8_t esp_pdma_read(ESPState *s) { + uint32_t dmalen =3D esp_get_tc(s); + uint8_t val; + + if (dmalen =3D=3D 0 || s->pdma_len =3D=3D 0) { + return 0; + } + switch (s->pdma_origin) { case PDMA: - return s->pdma_buf[s->pdma_cur++]; + val =3D s->pdma_buf[s->pdma_cur++]; + break; case TI: - return s->ti_buf[s->pdma_cur++]; + val =3D s->ti_buf[s->pdma_cur++]; + break; case CMD: - return s->cmdbuf[s->pdma_cur++]; + val =3D s->cmdbuf[s->pdma_cur++]; + break; case ASYNC: - return s->async_buf[s->pdma_cur++]; + val =3D s->async_buf[s->pdma_cur++]; + break; default: g_assert_not_reached(); } + + s->pdma_len--; + dmalen--; + esp_set_tc(s, dmalen); + + return val; } =20 static void esp_pdma_write(ESPState *s, uint8_t val) { + uint32_t dmalen =3D esp_get_tc(s); + + if (dmalen =3D=3D 0 || s->pdma_len =3D=3D 0) { + return; + } + switch (s->pdma_origin) { case PDMA: s->pdma_buf[s->pdma_cur++] =3D val; @@ -185,6 +208,10 @@ static void esp_pdma_write(ESPState *s, uint8_t val) default: g_assert_not_reached(); } + + s->pdma_len--; + dmalen--; + esp_set_tc(s, dmalen); } =20 static int get_cmd_cb(ESPState *s) @@ -944,27 +971,18 @@ static void sysbus_esp_pdma_write(void *opaque, hwadd= r addr, { SysBusESPState *sysbus =3D opaque; ESPState *s =3D ESP(&sysbus->esp); - uint32_t dmalen =3D esp_get_tc(s); =20 trace_esp_pdma_write(size); =20 - if (dmalen =3D=3D 0 || s->pdma_len =3D=3D 0) { - return; - } switch (size) { case 1: esp_pdma_write(s, val); - s->pdma_len--; - dmalen--; break; case 2: esp_pdma_write(s, val >> 8); esp_pdma_write(s, val); - s->pdma_len -=3D 2; - dmalen -=3D 2; break; } - esp_set_tc(s, dmalen); if (s->pdma_len =3D=3D 0 && s->pdma_cb) { esp_lower_drq(s); s->pdma_cb(s); @@ -988,17 +1006,13 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, h= waddr addr, switch (size) { case 1: val =3D esp_pdma_read(s); - s->pdma_len--; - dmalen--; break; case 2: val =3D esp_pdma_read(s); val =3D (val << 8) | esp_pdma_read(s); - s->pdma_len -=3D 2; - dmalen -=3D 2; break; } - esp_set_tc(s, dmalen); + dmalen =3D esp_get_tc(s); if (dmalen =3D=3D 0 || (s->pdma_len =3D=3D 0 && s->pdma_cb)) { esp_lower_drq(s); s->pdma_cb(s); --=20 2.20.1