From nobody Tue Nov 26 12:26:48 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 1707853433629255.58699195650377; Tue, 13 Feb 2024 11:43:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZygW-0000BK-0E; Tue, 13 Feb 2024 14:43:16 -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 1rZygV-000071-79 for qemu-devel@nongnu.org; Tue, 13 Feb 2024 14:43:15 -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 1rZygS-0006Tj-KL for qemu-devel@nongnu.org; Tue, 13 Feb 2024 14:43:14 -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 1rZyfZ-0008m4-Sw; Tue, 13 Feb 2024 19:42:21 +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=mJr37RlinPGRhEfpEIyzgMlMfF6VqeJF3dO28hs/Om0=; b=fjouwqiIzI8Qm5lUkYiNVeTW8g 53NMu/xqOjmw1xW1aPl+9D57UtPtSkyJspei5aiwZg+O5VM2J8Pvss429kVa+CjeLVrUtBUhe3WtI QOVJZlBrX937BOLBQJ/FejBgg62GcTFTvth5og26tnQ6jmZxl7OrTdj7hGOtVlU4JmoKOqzIzc/MH UzDyIVqzSBlV56Mb+gyX2VzGWcyTetQwNWgsR0AiW5Jkw8DQEElp1+6UIEcU5icEEyAkk+NRqIkFu sI1U5PBXBRJUAUB64h8bT1BR9d69a8uL/NXhtGQ4uHsOEuJ2Y897s2q84q4qZjOEPF/QfaxDTEVzp wPPm2/S1JF73yd8ig1Z2Q4k4dvmnQvEl5CiaEbyjkcK/Rt9fEAAZcIsLPZdr3LRBPr7PxMClF80VD 0o0WgTOCipY7FmIjpojtwGRXq+6QAaGK3msdneB+5KxjanJ+vXhueo8u6dtHj6bHH4BXyRwgq8N1q hT38JLSw/7Jnvd5W74DciLqlk8jPyz2H1hW+e03hjNDmGwdoAmXFbLoGU3J6UgQqxxS9bOmkCMwBt ck37h9Oufn/nIkQP6D+y+Vf4D2xVwCX3i4PcJh+jE0fQNkIvFweixyWt4QWrHfIgakzpHfK6QRJpK olOT/mdGM+h4n798h9C16nEYXks6zLNjtkXt+sa88=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Tue, 13 Feb 2024 19:39:59 +0000 Message-Id: <20240213194052.1162753-36-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 35/88] esp.c: move end of SCSI transfer check after TC adjustment in do_dma_pdma_cb() 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: 1707853435102100007 Content-Type: text/plain; charset="utf-8" Now it is possible to move the end of SCSI transfer check to after the TC adjustment in do_dma_pdma_cb() when transferring data from the device without triggering an assert() in the SCSI code. This brings this check in line with all the others in esp_do_dma() and do_dma_pdma_cb(). Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-36-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 9647be4cc3..df4d5f8811 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -615,15 +615,6 @@ static void do_dma_pdma_cb(ESPState *s) =20 esp_dma_ti_check(s); } else { - if (s->async_len =3D=3D 0 && fifo8_num_used(&s->fifo) < 2) { - /* Defer until the scsi layer has completed */ - scsi_req_continue(s->current_req); - s->data_in_ready =3D false; - return; - } - - esp_dma_ti_check(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)); @@ -632,6 +623,15 @@ static void do_dma_pdma_cb(ESPState *s) s->async_len -=3D len; s->ti_size -=3D len; esp_set_tc(s, esp_get_tc(s) - len); + + if (s->async_len =3D=3D 0 && fifo8_num_used(&s->fifo) < 2) { + /* Defer until the scsi layer has completed */ + scsi_req_continue(s->current_req); + s->data_in_ready =3D false; + return; + } + + esp_dma_ti_check(s); } } =20 --=20 2.39.2