From nobody Tue Feb 10 17:45: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=1612900425; cv=none; d=zohomail.com; s=zohoarc; b=Qs1ZYvepJq2DFHj7Q+R84EygsDQiM56mNtRtz5oee82aSsZApD6HmFBlxli4J22WVe2wxEMbZmvS9xi15dhYb+DoRkztg3XNkWIxH2Wdg95nmrFGQH8F0eD8ve3bVCtV+bX4rD8xa5NX0ebd6Of+j7CqbiX2rqfJWCW90cxoaVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612900425; 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=jZpb2r+zPltS7yP6gWJKOrRG7qsl2DYMOJ1PcR2cujk=; b=nsttimpn7HtR8r80ASJ8vJq9dZ02GkskkymXkBSiOWUN/fWpaUwY4aSlwrQ6ukkL/PZPt8sgKL5Xysbhelyk7dKsdB7IONe5IWGBoJXXr2NQw33zJjrEBCN3ijb9Q/7FvB+ZI0U3scQ726mBPAO2h1mbw96DwAEbZdcAJWQ/nrM= 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 161290042512295.29181526639968; Tue, 9 Feb 2021 11:53:45 -0800 (PST) Received: from localhost ([::1]:53594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Z4x-0005dA-Sh for importer@patchew.org; Tue, 09 Feb 2021 14:53:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9YlQ-0006dx-ER for qemu-devel@nongnu.org; Tue, 09 Feb 2021 14:33:32 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:57092 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 1l9YlK-00034L-8J for qemu-devel@nongnu.org; Tue, 09 Feb 2021 14:33:32 -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 1l9YlT-0007pt-FD; Tue, 09 Feb 2021 19:33:39 +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:30:12 +0000 Message-Id: <20210209193018.31339-37-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 36/42] esp: add maxlen parameter to get_cmd() 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" Some guests use a mixture of DMA and non-DMA transfers in combination with = the SATN and stop command to transfer message out phase and command phase bytes= to the target. Prepare for the next commit by adding a maxlen parameter to get_cmd() to allow partial transfers. Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/esp.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 617fdcb3ed..058b482fda 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -194,7 +194,7 @@ static int esp_select(ESPState *s) return 0; } =20 -static uint32_t get_cmd(ESPState *s) +static uint32_t get_cmd(ESPState *s, uint32_t maxlen) { uint8_t *buf =3D s->cmdbuf; uint32_t dmalen; @@ -202,8 +202,8 @@ static uint32_t get_cmd(ESPState *s) =20 target =3D s->wregs[ESP_WBUSID] & BUSID_DID; if (s->dma) { - dmalen =3D esp_get_tc(s); - if (dmalen > ESP_CMDBUF_SZ) { + dmalen =3D MIN(esp_get_tc(s), maxlen); + if (dmalen =3D=3D 0) { return 0; } if (s->dma_memory_read) { @@ -216,12 +216,14 @@ static uint32_t get_cmd(ESPState *s) return 0; } } else { - dmalen =3D s->ti_size; - if (dmalen > TI_BUFSZ) { + dmalen =3D MIN(s->ti_size, maxlen); + if (dmalen =3D=3D 0) { return 0; } memcpy(buf, s->ti_buf, dmalen); - buf[0] =3D buf[2] >> 5; + if (dmalen >=3D 3) { + buf[0] =3D buf[2] >> 5; + } } trace_esp_get_cmd(dmalen, target); =20 @@ -290,7 +292,7 @@ static void handle_satn(ESPState *s) return; } s->pdma_cb =3D satn_pdma_cb; - cmdlen =3D get_cmd(s); + cmdlen =3D get_cmd(s, ESP_CMDBUF_SZ); if (cmdlen > 0) { s->cmdlen =3D cmdlen; do_cmd(s); @@ -320,7 +322,7 @@ static void handle_s_without_atn(ESPState *s) return; } s->pdma_cb =3D s_without_satn_pdma_cb; - cmdlen =3D get_cmd(s); + cmdlen =3D get_cmd(s, ESP_CMDBUF_SZ); if (cmdlen > 0) { s->cmdlen =3D cmdlen; do_busid_cmd(s, s->cmdbuf, 0); @@ -355,7 +357,7 @@ static void handle_satn_stop(ESPState *s) return; } s->pdma_cb =3D satn_stop_pdma_cb; - cmdlen =3D get_cmd(s); + cmdlen =3D get_cmd(s, ESP_CMDBUF_SZ); if (cmdlen > 0) { trace_esp_handle_satn_stop(s->cmdlen); s->cmdlen =3D cmdlen; --=20 2.20.1