From nobody Fri Oct 25 19:31:28 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=1614896386; cv=none; d=zohomail.com; s=zohoarc; b=GC3/b9uRACrQs1zgtTWrdDECz4dEFumzIaRSGQYJCBLjDNVWCMJIe8ffJVEw4rNp/hV4cnFXsxe+cw/VVWpSkesmm8KGxBFGX4fbu2UocoFICSBkj07vD3tiA8qH6C0W4/oM2KFKGjfqqUbGVafdLdyIvCC++BbfrQ8LVLXFThs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614896386; 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=Zt9QFXjz1p1BC/rCkEfcC8WvCZPf0rYYzrua+DNQKlk=; b=Dhdbc1ulFiPLRx3snHTQB+lzSw2t3M+v1n+mUEYCI2os/wm2dSUi3kB9XB3lZ43e2I7by3tyVDeUbvSKwI4rQedXBu0XfOPY9hld1nydSxxxvF/iptIYRpMZrSF0b2enSZVMi1VwkH+2PKY3MLvdqGHbE6obd8uv8JhVvfVpVSw= 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 1614896386295425.8207646790796; Thu, 4 Mar 2021 14:19:46 -0800 (PST) Received: from localhost ([::1]:52792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHwJt-00082l-9X for importer@patchew.org; Thu, 04 Mar 2021 17:19:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHwCR-0005Yc-GR for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:12:06 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:39980 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 1lHwCP-0005mb-AB for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:12:03 -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 1lHwCJ-0008MJ-8Y; Thu, 04 Mar 2021 22:11:59 +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:30 +0000 Message-Id: <20210304221103.6369-10-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 09/42] esp: introduce esp_get_tc() and esp_set_tc() 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" These functions simplify reading and writing the TC register value without = having to manually shift each individual 8-bit value. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- hw/scsi/esp.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 5365523f6b..dd94f7b47b 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -98,6 +98,24 @@ void esp_request_cancelled(SCSIRequest *req) } } =20 +static uint32_t esp_get_tc(ESPState *s) +{ + uint32_t dmalen; + + dmalen =3D s->rregs[ESP_TCLO]; + dmalen |=3D s->rregs[ESP_TCMID] << 8; + dmalen |=3D s->rregs[ESP_TCHI] << 16; + + return dmalen; +} + +static void esp_set_tc(ESPState *s, uint32_t dmalen) +{ + s->rregs[ESP_TCLO] =3D dmalen; + s->rregs[ESP_TCMID] =3D dmalen >> 8; + s->rregs[ESP_TCHI] =3D dmalen >> 16; +} + static void set_pdma(ESPState *s, enum pdma_origin_id origin, uint32_t index, uint32_t len) { @@ -157,9 +175,7 @@ static uint32_t get_cmd(ESPState *s, uint8_t *buf, uint= 8_t buflen) =20 target =3D s->wregs[ESP_WBUSID] & BUSID_DID; if (s->dma) { - dmalen =3D s->rregs[ESP_TCLO]; - dmalen |=3D s->rregs[ESP_TCMID] << 8; - dmalen |=3D s->rregs[ESP_TCHI] << 16; + dmalen =3D esp_get_tc(s); if (dmalen > buflen) { return 0; } @@ -348,9 +364,7 @@ static void esp_dma_done(ESPState *s) s->rregs[ESP_RINTR] =3D INTR_BS; s->rregs[ESP_RSEQ] =3D 0; s->rregs[ESP_RFLAGS] =3D 0; - s->rregs[ESP_TCLO] =3D 0; - s->rregs[ESP_TCMID] =3D 0; - s->rregs[ESP_TCHI] =3D 0; + esp_set_tc(s, 0); esp_raise_irq(s); } =20 @@ -535,9 +549,7 @@ static void handle_ti(ESPState *s) return; } =20 - dmalen =3D s->rregs[ESP_TCLO]; - dmalen |=3D s->rregs[ESP_TCMID] << 8; - dmalen |=3D s->rregs[ESP_TCHI] << 16; + dmalen =3D esp_get_tc(s); if (dmalen =3D=3D 0) { dmalen =3D 0x10000; } @@ -888,9 +900,7 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr = addr, =20 trace_esp_pdma_write(size); =20 - dmalen =3D s->rregs[ESP_TCLO]; - dmalen |=3D s->rregs[ESP_TCMID] << 8; - dmalen |=3D s->rregs[ESP_TCHI] << 16; + dmalen =3D esp_get_tc(s); if (dmalen =3D=3D 0 || s->pdma_len =3D=3D 0) { return; } @@ -907,9 +917,7 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr = addr, dmalen -=3D 2; break; } - s->rregs[ESP_TCLO] =3D dmalen & 0xff; - s->rregs[ESP_TCMID] =3D dmalen >> 8; - s->rregs[ESP_TCHI] =3D dmalen >> 16; + esp_set_tc(s, dmalen); if (s->pdma_len =3D=3D 0 && s->pdma_cb) { esp_lower_drq(s); s->pdma_cb(s); --=20 2.20.1