From nobody Tue Nov 26 12:31:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 170785489529826.98987270468558; Tue, 13 Feb 2024 12:08:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZz0U-0004YA-Ph; Tue, 13 Feb 2024 15:03:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZyzD-0002q1-2I for qemu-devel@nongnu.org; Tue, 13 Feb 2024 15:02:37 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZyzB-00024P-GU for qemu-devel@nongnu.org; Tue, 13 Feb 2024 15:02:34 -0500 Received: from [2a00:23c4:8bb2:1300:c500:f104:bc51:e670] (helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rZyhZ-0008m4-WF; Tue, 13 Feb 2024 19:44:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=DXz/XkjLmoOh4xUlStStFIWpQWovnmYeHWy5j+nGFhI=; b=hBZBnb3tZwOAy/sf43FsQLhf2P IAbUpRHbRiOUB1DFQrNagbydZlGe9K5hGVxN6ri4imefbH3yrhryVq95FRVZqy8sZjJva8h7sgOUT cTl1In4oA4f2sCVFYqcML6XZcyM/z1ouQ9dE0CzwAIw6RSP9jxlMcTUdYDBdOKtY25UVYu/7M9hB2 LUO3yhP/6lkmtvKxE03AxSUoF46xroL4xh45mECG26N1xwORh+7g9qFMCWXcORKdv+mWkZXty7+uY SK8pCOlkgqEC0rP0CFg+4ZZvDljiQWNm91BU5Uk/xbFVgGf46Qlx8gWpVRAk+CTEMv6f2gjmHGAcq hdNfKQUFY62O6kNnGFVoOGmvQX+19PeqhmuJ4bzKfMjaM7RPc2Woowg6TIlBZr1pcnnaFlcKfgtUs TKJDDYNfGqUYzXbrzbX3xncqj5a3pFaLkux8f5FYQnY9CBHP6EsHY0QlgfwWPDyUVPrSaeC6e6nnL vFIK53IxPluc3Ix9LInVaELJS+o9OM8Xf51StFcolHs/7f/07JfaFzcxWnD5mwZlesCDlK4z8fUNF iB6ZhObavdvbe9R2uzjRWVffmrreZnVxDgk0U5i8DRasXcW1wD5qu6YW9s6krFKR7HxMqcPXf4GDF hN2QcQfZ/zwJpDuAynshh84e+mtJw8Y7zBJpx9e0M=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Tue, 13 Feb 2024 19:40:39 +0000 Message-Id: <20240213194052.1162753-76-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240213194052.1162753-1-mark.cave-ayland@ilande.co.uk> References: <20240213194052.1162753-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bb2:1300:c500:f104:bc51:e670 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 75/88] esp.c: improve ESP_RSEQ logic consolidation X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1707854895630100001 Content-Type: text/plain; charset="utf-8" The ESP_RSEQ logic is scattered in a few places throughout the ESP state ma= chine which is mainly because the ESP_RSEQ register isn't always reset when execu= ting an ESP select command. Once this is done, the ESP_RSEQ register only needs = to be updated at the point where the sequencer command completes. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-76-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index aa7dec71e3..ca26415d5f 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -230,6 +230,7 @@ static int esp_select(ESPState *s) target =3D s->wregs[ESP_WBUSID] & BUSID_DID; =20 s->ti_size =3D 0; + s->rregs[ESP_RSEQ] =3D SEQ_0; =20 if (s->current_req) { /* Started a new command before the old one finished. Cancel it. */ @@ -241,7 +242,6 @@ static int esp_select(ESPState *s) /* No such drive */ s->rregs[ESP_RSTAT] =3D 0; s->rregs[ESP_RINTR] =3D INTR_DC; - s->rregs[ESP_RSEQ] =3D SEQ_0; esp_raise_irq(s); return -1; } @@ -250,7 +250,6 @@ static int esp_select(ESPState *s) * Note that we deliberately don't raise the IRQ here: this will be do= ne * either in esp_transfer_data() or esp_command_complete() */ - s->rregs[ESP_RSEQ] =3D SEQ_CD; return 0; } =20 @@ -358,7 +357,6 @@ static void handle_s_without_atn(ESPState *s) } =20 esp_set_phase(s, STAT_CD); - s->rregs[ESP_RSEQ] =3D SEQ_CD; s->cmdfifo_cdb_offset =3D 0; =20 if (s->dma) { @@ -380,7 +378,6 @@ static void handle_satn_stop(ESPState *s) } =20 esp_set_phase(s, STAT_MO); - s->rregs[ESP_RSEQ] =3D SEQ_MO; s->cmdfifo_cdb_offset =3D 0; =20 if (s->dma) { @@ -456,6 +453,7 @@ static void esp_do_dma(ESPState *s) if (fifo8_num_used(&s->cmdfifo) >=3D 1) { /* First byte received, switch to command phase */ esp_set_phase(s, STAT_CD); + s->rregs[ESP_RSEQ] =3D SEQ_CD; s->cmdfifo_cdb_offset =3D 1; =20 if (fifo8_num_used(&s->cmdfifo) > 1) { @@ -468,11 +466,11 @@ static void esp_do_dma(ESPState *s) case CMD_SELATNS | CMD_DMA: if (fifo8_num_used(&s->cmdfifo) =3D=3D 1) { /* First byte received, stop in message out phase */ + s->rregs[ESP_RSEQ] =3D SEQ_MO; s->cmdfifo_cdb_offset =3D 1; =20 /* Raise command completion interrupt */ s->rregs[ESP_RINTR] |=3D INTR_BS | INTR_FC; - s->rregs[ESP_RSEQ] =3D SEQ_CD; esp_raise_irq(s); } break; @@ -482,7 +480,6 @@ static void esp_do_dma(ESPState *s) if (esp_get_tc(s) =3D=3D 0) { esp_set_phase(s, STAT_CD); s->rregs[ESP_CMD] =3D 0; - s->rregs[ESP_RSEQ] =3D SEQ_CD; s->rregs[ESP_RINTR] |=3D INTR_BS; esp_raise_irq(s); } @@ -726,6 +723,7 @@ static void esp_do_nodma(ESPState *s) if (fifo8_num_used(&s->cmdfifo) >=3D 1) { /* First byte received, switch to command phase */ esp_set_phase(s, STAT_CD); + s->rregs[ESP_RSEQ] =3D SEQ_CD; s->cmdfifo_cdb_offset =3D 1; =20 if (fifo8_num_used(&s->cmdfifo) > 1) { @@ -738,6 +736,7 @@ static void esp_do_nodma(ESPState *s) case CMD_SELATNS: if (fifo8_num_used(&s->cmdfifo) >=3D 1) { /* First byte received, stop in message out phase */ + s->rregs[ESP_RSEQ] =3D SEQ_MO; s->cmdfifo_cdb_offset =3D 1; =20 /* Raise command completion interrupt */ @@ -903,6 +902,7 @@ void esp_command_complete(SCSIRequest *req, size_t resi= d) * and function complete interrupt */ s->rregs[ESP_RINTR] |=3D INTR_BS | INTR_FC; + s->rregs[ESP_RSEQ] =3D SEQ_CD; break; =20 case CMD_TI | CMD_DMA: @@ -948,6 +948,7 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len) * so raise deferred bus service and function complete interru= pt */ s->rregs[ESP_RINTR] |=3D INTR_BS | INTR_FC; + s->rregs[ESP_RSEQ] =3D SEQ_CD; break; =20 case CMD_SELATNS | CMD_DMA: @@ -957,6 +958,7 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len) * completion interrupt */ s->rregs[ESP_RINTR] |=3D INTR_BS; + s->rregs[ESP_RSEQ] =3D SEQ_MO; break; =20 case CMD_TI | CMD_DMA: --=20 2.39.2