From nobody Tue Nov 18 10:39:18 2025 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=1609343135; cv=none; d=zohomail.com; s=zohoarc; b=TuEqEee/oHULvQ0A4qxdtuTnpygu/NNdGXFeeHgqokfXGBkJFwJkr4GMZbf2T2dFVh1Mvog5Qwx1AoX9I3wtBy1txa01voAoLfOyfOI3i2ZMxvCWAfp2MBBiwisflFVDddDdNooN11uAlrzIxSwAnynW72MMHNEPNBK1kB+k1gE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609343135; h=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=ft6Zi444176FkaNKoW+XEEVbXrcFzzhde4ZKdTCGpS8=; b=X6xC5rNlbR8fw72aD4Ek8CYZw/9tGdKJf+m+c4MWInkEvRcQaBuLP5wkQwr2w9ESc5saqyL823JeQQ5NJxP+h8ZQ399wOq6sBGDExtGllTEQaZyjimZ3o0gPppRPSw+ReNCYI3FwaOb6aiNIZVJChE5oko8KtU0LrLKFtWcOKkk= 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 1609343135909630.1609625537174; Wed, 30 Dec 2020 07:45:35 -0800 (PST) Received: from localhost ([::1]:59486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kudfK-0000Tu-J1 for importer@patchew.org; Wed, 30 Dec 2020 10:45:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kudYe-0000Mb-Ly for qemu-devel@nongnu.org; Wed, 30 Dec 2020 10:38:40 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:50796 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 1kudYd-00023p-2j for qemu-devel@nongnu.org; Wed, 30 Dec 2020 10:38:40 -0500 Received: from host86-148-34-1.range86-148.btcentralplus.com ([86.148.34.1] 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 1kudYc-00070L-4G; Wed, 30 Dec 2020 15:38:42 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Wed, 30 Dec 2020 15:37:29 +0000 Message-Id: <20201230153745.30241-10-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201230153745.30241-1-mark.cave-ayland@ilande.co.uk> References: <20201230153745.30241-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.34.1 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 09/25] esp: remove dma_counter from ESPState 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" Content-Type: text/plain; charset="utf-8" The value of dma_counter is set once at the start of the transfer and remai= ns the same until the transfer is complete. This allows the check in esp_trans= fer_data to be simplified since dma_left will always be non-zero until the transfer = is completed. Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 5 ++--- include/hw/scsi/esp.h | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index f38b4a2ecd..5b47d035ab 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -229,7 +229,6 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uin= t8_t busid) if (datalen !=3D 0) { s->rregs[ESP_RSTAT] =3D STAT_TC; s->dma_left =3D 0; - s->dma_counter =3D 0; if (datalen > 0) { s->rregs[ESP_RSTAT] |=3D STAT_DI; } else { @@ -538,6 +537,7 @@ void esp_command_complete(SCSIRequest *req, uint32_t st= atus, void esp_transfer_data(SCSIRequest *req, uint32_t len) { ESPState *s =3D req->hba_private; + int to_device =3D ((s->rregs[ESP_RSTAT] & 7) =3D=3D STAT_DO); =20 assert(!s->do_cmd); trace_esp_transfer_data(s->dma_left, s->ti_size); @@ -545,7 +545,7 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len) s->async_buf =3D scsi_req_get_buf(req); if (s->dma_left) { esp_do_dma(s); - } else if (s->dma_counter !=3D 0 && s->ti_size <=3D 0) { + } else if (to_device) { /* * If this was the last part of a DMA transfer then the * completion interrupt is deferred to here. @@ -564,7 +564,6 @@ static void handle_ti(ESPState *s) } =20 dmalen =3D esp_get_tc(s); - s->dma_counter =3D dmalen; =20 if (s->do_cmd) { minlen =3D (dmalen < ESP_CMDBUF_SZ) ? dmalen : ESP_CMDBUF_SZ; diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index 60cc3047a5..b307f5d261 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -45,9 +45,6 @@ struct ESPState { =20 /* The amount of data left in the current DMA transfer. */ uint32_t dma_left; - /* The size of the current DMA transfer. Zero if no transfer is in - progress. */ - uint32_t dma_counter; int dma_enabled; =20 uint32_t async_len; --=20 2.20.1