From nobody Tue Nov 26 12:49:57 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 1707853432774824.8671998554333; Tue, 13 Feb 2024 11:43:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyev-0002it-S3; Tue, 13 Feb 2024 14:41:37 -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 1rZyeu-0002il-DA for qemu-devel@nongnu.org; Tue, 13 Feb 2024 14:41:36 -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 1rZyet-0006HD-0M for qemu-devel@nongnu.org; Tue, 13 Feb 2024 14:41:36 -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 1rZye9-0008m4-A7; Tue, 13 Feb 2024 19:40:53 +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=nO+ngFbqX34GmWdyHyDwlZOuxb9VSNiPAp1CSju1IoQ=; b=q9DpdXp/mMLAWYx0xdvmZzNgvD i7batKoXDJRflAre8sbl22d3uh5nJGCPA8iNdy5vZ2km1DVFq+AyxoXsYcWDCEbag6oZ5/EZ8N7ew IM/yCm4MK6e92kbpGdBKE7ZVWpDXQF7RQ+63x7+YQwAi5KAxzcKKgtuN8Mj0uxam86hmtdbZU5Syv Lca+w6+ICmpL8/6oEwBPHGahAnIerujdqF6Bs2sZextadspa0v2IQ7nnoYE19heUAgchrY0KmpQ94 y3qEUGZ+zN7yUJcwBpsLCu/orx8W0PvVUaE5B48eJThnCiG1DYDrFf15oK7DtJiebToNuVFr/GgT0 nPY4lRUveulx41kMx6YBRERYayNIzSBhxEqrroOVvfUutrXO+/lZgjhCrIKO7BNDbtfrIfjyZeVWd CNyoGX69rfLkocO3aE/qfC84OV0WfS3KKYS0r7Cj2DkEU6tl9cIl8ImES1ap/+uUUTdAeiUKoq28H zjprvzA+a9uGX1GSktzAENF7N1dDJ76FoeAV6OJG8gz8rH9zGiIfWxWZuqUADKLKh5nUBpkWjbxr2 wYEEbVrwsutEQjHJaw7MQflWkPXCpbGHh8v/ozpXRv9Ops79hfbJ2gNr93EId6wpmeKbza38KdkDq yKaTdB3dI1Eq46rCxEou6uda5XASiXp+JN8s5uvjA=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Tue, 13 Feb 2024 19:39:33 +0000 Message-Id: <20240213194052.1162753-10-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 09/88] esp.c: update TC check logic in do_dma_pdma_cb() to check for TC == 0 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: 1707853433140100001 Content-Type: text/plain; charset="utf-8" Invert the logic so that the end of DMA transfer check becomes one that che= cks for TC =3D=3D 0 in the from device path in do_dma_pdma_cb(). Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-10-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index fecfef7c89..63c828c1b2 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -602,21 +602,19 @@ static void do_dma_pdma_cb(ESPState *s) return; } =20 - if (esp_get_tc(s) !=3D 0) { - /* Copy device data to FIFO */ - len =3D MIN(s->async_len, esp_get_tc(s)); - len =3D MIN(len, fifo8_num_free(&s->fifo)); - fifo8_push_all(&s->fifo, s->async_buf, len); - s->async_buf +=3D len; - s->async_len -=3D len; - s->ti_size -=3D len; - esp_set_tc(s, esp_get_tc(s) - len); - return; + if (esp_get_tc(s) =3D=3D 0) { + esp_lower_drq(s); + esp_dma_done(s); } =20 - /* Partially filled a scsi buffer. Complete immediately. */ - esp_lower_drq(s); - esp_dma_done(s); + /* Copy device data to FIFO */ + len =3D MIN(s->async_len, esp_get_tc(s)); + len =3D MIN(len, fifo8_num_free(&s->fifo)); + fifo8_push_all(&s->fifo, s->async_buf, len); + s->async_buf +=3D len; + s->async_len -=3D len; + s->ti_size -=3D len; + esp_set_tc(s, esp_get_tc(s) - len); } } =20 --=20 2.39.2