From nobody Tue Feb 10 19:17:11 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=1612900291; cv=none; d=zohomail.com; s=zohoarc; b=OjJ002kA0znIEdK1mlso08tmgI5MeLScB7KuP/MtkABTpZDwg3tQc+lQDxFRub7Hsfr/K0qui51PnQyJFVcQpFZHqqvX7qF4lrg+OR1gzLFDDEXBmp/qPaAnOCXge1Fx1sm+KcfpgYZ/i2UnmceXTUWLRp2vEaZi/Zx39U+kQXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612900291; 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=MTMyLs6Lhc4bUczXzPQ2ALJoxd/+As4KlFrWiBz4S2g=; b=WvoYw1YFHQl0EBt2WaJx8bKg2aDDSs0g3tchrJPGkMJ4iMckuyC6bW8Btrvx/zXXwpEXOtaFA3ns/DR/Y+BMp/gCFXTTyzzMH+HQpwwBbPfKPQ14IyEosa//Zz/UZ3F9a378HVyGzjCo9R43mw+73e3geNEcEGjKD8zmTtt3lYc= 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 1612900291013191.02216567846597; Tue, 9 Feb 2021 11:51:31 -0800 (PST) Received: from localhost ([::1]:45704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Z2o-0002Ip-1y for importer@patchew.org; Tue, 09 Feb 2021 14:51:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9Yjk-00052J-1N for qemu-devel@nongnu.org; Tue, 09 Feb 2021 14:31:49 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:56880 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 1l9Yjf-0002To-8M for qemu-devel@nongnu.org; Tue, 09 Feb 2021 14:31:47 -0500 Received: from host109-153-84-1.range109-153.btcentralplus.com ([109.153.84.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 1l9Yjz-0007pt-Ho; Tue, 09 Feb 2021 19:32:06 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Tue, 9 Feb 2021 19:29:51 +0000 Message-Id: <20210209193018.31339-16-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210209193018.31339-1-mark.cave-ayland@ilande.co.uk> References: <20210209193018.31339-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 109.153.84.1 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 15/42] esp: introduce esp_pdma_read() and esp_pdma_write() functions 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" Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/esp.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index e7cf36f4b8..b0cba889a9 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -151,6 +151,20 @@ static uint8_t *get_pdma_buf(ESPState *s) return NULL; } =20 +static uint8_t esp_pdma_read(ESPState *s) +{ + uint8_t *buf =3D get_pdma_buf(s); + + return buf[s->pdma_cur++]; +} + +static void esp_pdma_write(ESPState *s, uint8_t val) +{ + uint8_t *buf =3D get_pdma_buf(s); + + buf[s->pdma_cur++] =3D val; +} + static int get_cmd_cb(ESPState *s) { int target; @@ -910,7 +924,6 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr = addr, SysBusESPState *sysbus =3D opaque; ESPState *s =3D ESP(&sysbus->esp); uint32_t dmalen =3D esp_get_tc(s); - uint8_t *buf =3D get_pdma_buf(s); =20 trace_esp_pdma_write(size); =20 @@ -919,13 +932,13 @@ static void sysbus_esp_pdma_write(void *opaque, hwadd= r addr, } switch (size) { case 1: - buf[s->pdma_cur++] =3D val; + esp_pdma_write(s, val); s->pdma_len--; dmalen--; break; case 2: - buf[s->pdma_cur++] =3D val >> 8; - buf[s->pdma_cur++] =3D val; + esp_pdma_write(s, val >> 8); + esp_pdma_write(s, val); s->pdma_len -=3D 2; dmalen -=3D 2; break; @@ -944,7 +957,6 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, hwad= dr addr, SysBusESPState *sysbus =3D opaque; ESPState *s =3D ESP(&sysbus->esp); uint32_t dmalen =3D esp_get_tc(s); - uint8_t *buf =3D get_pdma_buf(s); uint64_t val =3D 0; =20 trace_esp_pdma_read(size); @@ -954,13 +966,13 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, hw= addr addr, } switch (size) { case 1: - val =3D buf[s->pdma_cur++]; + val =3D esp_pdma_read(s); s->pdma_len--; dmalen--; break; case 2: - val =3D buf[s->pdma_cur++]; - val =3D (val << 8) | buf[s->pdma_cur++]; + val =3D esp_pdma_read(s); + val =3D (val << 8) | esp_pdma_read(s); s->pdma_len -=3D 2; dmalen -=3D 2; break; --=20 2.20.1