From nobody Tue Feb 10 17:45:41 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=1612901078; cv=none; d=zohomail.com; s=zohoarc; b=HP4d0oNDvjWLBDlIV4G43bv8l6AYtiFQjAdEA/+Gy1UxKNJGdHjHxP3CDksBPV3H9DEBWBbtRgPCDtgIug8GwN76EOPOOlNl0OM3TdoEJIsnpFT5qVvJ5avxsqHMX+Sa0gwhad8fr+YF/266JmMo1z3pDDikBXI2mTAoMi3ag2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612901078; 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=vNNyKxChSsLq8BuOv2WtR0CTtgC+HyZ7yRh5OkSO1cc=; b=m6n0zWfYs0QW2gGPD90PxBsGSSroC7LzpDxKjoHIR9BNbDTO+wyOlsQNrd5C2NlAmmTEQBbOhORwAOLHHJIR031XN0v8KUQgKsEQwJhVGaT7JYgGj1zis+OFCM0gbY2+f+yaqFLnJGFv6xFFqR6+rRS9FRFMIYOGXqDuVwmbDIw= 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 1612901078560693.4303261622761; Tue, 9 Feb 2021 12:04:38 -0800 (PST) Received: from localhost ([::1]:51892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9ZFV-0000GY-HP for importer@patchew.org; Tue, 09 Feb 2021 15:04:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9YkV-0005oh-7k for qemu-devel@nongnu.org; Tue, 09 Feb 2021 14:32:35 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:56982 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 1l9YkT-0002md-KC for qemu-devel@nongnu.org; Tue, 09 Feb 2021 14:32:34 -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 1l9Ykc-0007pt-48; Tue, 09 Feb 2021 19:32:46 +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:01 +0000 Message-Id: <20210209193018.31339-26-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 25/42] esp: remove CMD pdma_origin 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 cmdbuf is really just a copy of FIFO data (including extra message phase bytes) so its pdma_origin is effectively TI. Fortunately we already know wh= en we are receiving a SCSI command since do_cmd =3D=3D 1 which enables us to distinguish between the two cases in esp_pdma_read()/esp_pdma_write(). Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/esp.c | 22 ++++++++++++---------- include/hw/scsi/esp.h | 1 - 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index bff330733f..921f79ae89 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -143,10 +143,11 @@ static uint8_t esp_pdma_read(ESPState *s) =20 switch (s->pdma_origin) { case TI: - val =3D s->ti_buf[s->ti_rptr++]; - break; - case CMD: - val =3D s->cmdbuf[s->cmdlen++]; + if (s->do_cmd) { + val =3D s->cmdbuf[s->cmdlen++]; + } else { + val =3D s->ti_buf[s->ti_rptr++]; + } break; case ASYNC: val =3D s->async_buf[0]; @@ -176,10 +177,11 @@ static void esp_pdma_write(ESPState *s, uint8_t val) =20 switch (s->pdma_origin) { case TI: - s->ti_buf[s->ti_wptr++] =3D val; - break; - case CMD: - s->cmdbuf[s->cmdlen++] =3D val; + if (s->do_cmd) { + s->cmdbuf[s->cmdlen++] =3D val; + } else { + s->ti_buf[s->ti_wptr++] =3D val; + } break; case ASYNC: s->async_buf[0] =3D val; @@ -240,7 +242,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); + set_pdma(s, TI); esp_raise_drq(s); return 0; } @@ -471,7 +473,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); + set_pdma(s, TI); s->pdma_cb =3D do_dma_pdma_cb; esp_raise_drq(s); return; diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h index 1e84b7bfb0..a8d5bf8a63 100644 --- a/include/hw/scsi/esp.h +++ b/include/hw/scsi/esp.h @@ -17,7 +17,6 @@ typedef struct ESPState ESPState; =20 enum pdma_origin_id { TI, - CMD, ASYNC, }; =20 --=20 2.20.1