From nobody Mon Feb 9 20:48:42 2026 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=1615120967; cv=none; d=zohomail.com; s=zohoarc; b=jjzcr8oJ9VmaRIogoTuDRFKM9dIsUYjU2/POm4jZZsZ/jhCUpUM+rmxcLofxxM2Oq4N+lke2CrzU7ozB6iVXx/W7FDEDBAc/o6p4FE+nZYgYdzoOtDA4psHOJ+hrJT7ZVVjbHaINfnKzEaEw8eCO9jsJfrA+sHpX75mVtz5WCaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615120967; 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=5Ps2HjAeWwxkxE+wY2xz2+1BtS+GmspGVDIK4nfxr6g=; b=igBgt269Yv5Wx3EzkFrPljlsmSXBcE2B16Ls0Fvpq/TtnPotTYGr6pEvenkDER5B2hySVYcgxhHRVqcBLPzp+AU5ooicH+0jtyCeDDPxRf7mjDx3oMI6iW1k/yCC67wOA4osbqEYvwu6vdjRhedId4bGdkxqxaRk9/1DPRdrN+g= 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 1615120967979812.4991708946262; Sun, 7 Mar 2021 04:42:47 -0800 (PST) Received: from localhost ([::1]:51454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIskA-0005eH-T7 for importer@patchew.org; Sun, 07 Mar 2021 07:42:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIsFk-0002ES-Im for qemu-devel@nongnu.org; Sun, 07 Mar 2021 07:11:20 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:43696 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 1lIsFf-0007yH-Dn for qemu-devel@nongnu.org; Sun, 07 Mar 2021 07:11:20 -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 1lIsFQ-0002V5-AW; Sun, 07 Mar 2021 12:11:05 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 7 Mar 2021 12:08:32 +0000 Message-Id: <20210307120850.10418-25-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210307120850.10418-1-mark.cave-ayland@ilande.co.uk> References: <20210307120850.10418-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: [PULL 24/42] esp: use in-built TC to determine PDMA transfer length 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" Real hardware simply counts down using the in-built TC to determine when the the PDMA request is complete. Use the TC to determine the PDMA transfer len= gth which then enables us to remove the redundant pdma_len variable. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier Message-Id: <20210304221103.6369-25-mark.cave-ayland@ilande.co.uk> --- hw/scsi/esp.c | 28 +++++++++++++--------------- include/hw/scsi/esp.h | 1 - 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 7bf2ec9c94..c80dc606e8 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -127,10 +127,9 @@ static uint32_t esp_get_stc(ESPState *s) return dmalen; } =20 -static void set_pdma(ESPState *s, enum pdma_origin_id origin, uint32_t len) +static void set_pdma(ESPState *s, enum pdma_origin_id origin) { s->pdma_origin =3D origin; - s->pdma_len =3D len; } =20 static uint8_t esp_pdma_read(ESPState *s) @@ -138,7 +137,7 @@ static uint8_t esp_pdma_read(ESPState *s) uint32_t dmalen =3D esp_get_tc(s); uint8_t val; =20 - if (dmalen =3D=3D 0 || s->pdma_len =3D=3D 0) { + if (dmalen =3D=3D 0) { return 0; } =20 @@ -161,7 +160,6 @@ static uint8_t esp_pdma_read(ESPState *s) } =20 s->ti_size--; - s->pdma_len--; dmalen--; esp_set_tc(s, dmalen); =20 @@ -172,7 +170,7 @@ static void esp_pdma_write(ESPState *s, uint8_t val) { uint32_t dmalen =3D esp_get_tc(s); =20 - if (dmalen =3D=3D 0 || s->pdma_len =3D=3D 0) { + if (dmalen =3D=3D 0) { return; } =20 @@ -195,7 +193,6 @@ static void esp_pdma_write(ESPState *s, uint8_t val) } =20 s->ti_size++; - s->pdma_len--; dmalen--; esp_set_tc(s, dmalen); } @@ -243,7 +240,7 @@ static uint32_t get_cmd(ESPState *s) if (s->dma_memory_read) { s->dma_memory_read(s->dma_opaque, buf, dmalen); } else { - set_pdma(s, CMD, dmalen); + set_pdma(s, CMD); esp_raise_drq(s); return 0; } @@ -406,7 +403,7 @@ static void write_response(ESPState *s) s->rregs[ESP_RINTR] =3D INTR_BS | INTR_FC; s->rregs[ESP_RSEQ] =3D SEQ_CD; } else { - set_pdma(s, TI, 2); + set_pdma(s, TI); s->pdma_cb =3D write_response_pdma_cb; esp_raise_drq(s); return; @@ -474,7 +471,7 @@ static void esp_do_dma(ESPState *s) if (s->dma_memory_read) { s->dma_memory_read(s->dma_opaque, &s->cmdbuf[s->cmdlen], len); } else { - set_pdma(s, CMD, len); + set_pdma(s, CMD); s->pdma_cb =3D do_dma_pdma_cb; esp_raise_drq(s); return; @@ -497,7 +494,7 @@ static void esp_do_dma(ESPState *s) if (s->dma_memory_read) { s->dma_memory_read(s->dma_opaque, s->async_buf, len); } else { - set_pdma(s, ASYNC, len); + set_pdma(s, ASYNC); s->pdma_cb =3D do_dma_pdma_cb; esp_raise_drq(s); return; @@ -506,7 +503,7 @@ static void esp_do_dma(ESPState *s) if (s->dma_memory_write) { s->dma_memory_write(s->dma_opaque, s->async_buf, len); } else { - set_pdma(s, ASYNC, len); + set_pdma(s, ASYNC); s->pdma_cb =3D do_dma_pdma_cb; esp_raise_drq(s); return; @@ -850,7 +847,6 @@ static const VMStateDescription vmstate_esp_pdma =3D { .needed =3D esp_pdma_needed, .fields =3D (VMStateField[]) { VMSTATE_INT32(pdma_origin, ESPState), - VMSTATE_UINT32(pdma_len, ESPState), VMSTATE_END_OF_LIST() } }; @@ -949,6 +945,7 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr = addr, { SysBusESPState *sysbus =3D opaque; ESPState *s =3D ESP(&sysbus->esp); + uint32_t dmalen; =20 trace_esp_pdma_write(size); =20 @@ -961,7 +958,8 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr = addr, esp_pdma_write(s, val); break; } - if (s->pdma_len =3D=3D 0 && s->pdma_cb) { + dmalen =3D esp_get_tc(s); + if (dmalen =3D=3D 0 && s->pdma_cb) { esp_lower_drq(s); s->pdma_cb(s); s->pdma_cb =3D NULL; @@ -978,7 +976,7 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, hwad= dr addr, =20 trace_esp_pdma_read(size); =20 - if (dmalen =3D=3D 0 || s->pdma_len =3D=3D 0) { + if (dmalen =3D=3D 0) { return 0; } switch (size) { @@ -991,7 +989,7 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, hwad= dr addr, break; } dmalen =3D esp_get_tc(s); - if (dmalen =3D=3D 0 || (s->pdma_len =3D=3D 0 && s->pdma_cb)) { + if (dmalen =3D=3D 0 && s->pdma_cb) { esp_lower_drq(s); s->pdma_cb(s); s->pdma_cb =3D NULL; diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index 26bd015cf4..1be4586aff 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -57,7 +57,6 @@ struct ESPState { void *dma_opaque; void (*dma_cb)(ESPState *s); int pdma_origin; - uint32_t pdma_len; void (*pdma_cb)(ESPState *s); =20 uint8_t mig_version_id; --=20 2.20.1