From nobody Tue Nov 26 12:18:35 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 1707854948597421.9671244602438; Tue, 13 Feb 2024 12:09:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZz0n-0005CW-W8; Tue, 13 Feb 2024 15:04:14 -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 1rZz0c-0004mF-Ee for qemu-devel@nongnu.org; Tue, 13 Feb 2024 15:04:03 -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 1rZz0P-0002DK-Vk for qemu-devel@nongnu.org; Tue, 13 Feb 2024 15:04:02 -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 1rZygn-0008m4-4y; Tue, 13 Feb 2024 19:43:37 +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=O7NEKvkbj4MXy755AuslcZ73cjKfcA574sHWMKhGl18=; b=MNWsJ5Q3ymM6Sq4CX3NGrv86Mg 6CVQUdDd2VwWEVlsQlwiwVod2D/XnryNEcmonnk6JQSqoXdZqmZeR0jJGEvLCq0g7Vvd34UpsMUjP Y+9ZaARs33D8L8a83W8EBNZwgaOjubygKXD2xJBu7UfVi+RRTfH2tF4tnIv+38FCfy474o7M/gjoF /h4cM7boLGV1mdlGKZCZlVW/S4ow+21fZuf+R3TkzdHgRAI9ze464LHnVdIPEh1JLsyR69shmDc/t OltvFSTMmq4g4Lu93zAsaGYZfK7SwFC49nbaVyNfeBauACGk2jsiYCs3ZQ9blIcJpup5XbB7g+DB7 Jyz/kZxejcKZy5RAKLEcw8mC0yWJo2FDfSnE/J5+wvnLY5r5FOQeqxmbd8LIbXdZ2BdK0ntcr5B8w oTAVnqWLfIvz7R42tyFwixbaJH2Dl6gVk1FJH1GGc0HhBrVrcLaUg0d+T9wYlHlldNxXIjHZq/KPZ r+1iZ8ACsXP/k08cfovtOSYU8yEFoII73QtFWV4a7PM6Asf8zdcBeXeTjyeyJvTzRJRwjF02oIQg1 KS+WwZLPPed/zPpAmW7Bs6nevb8GrXOBKe5rC9CGCkfLxX2qRtSpuDZOEVLcAdEO3fy3/FuNyE3Ch XRhgzL4dDP9GMj/zVnVDGDHtW88+Qxw3NQjWZQgwE=; From: Mark Cave-Ayland To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Tue, 13 Feb 2024 19:40:22 +0000 Message-Id: <20240213194052.1162753-59-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 58/88] esp.c: separate logic based upon ESP command in esp_command_complete() 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: 1707854949750100005 Content-Type: text/plain; charset="utf-8" The handling of the INTR_FC and INTR_BS bits is different depending upon the last command executed by the ESP. Note that currently INTR_FC is managed elsewhere, but that will change soon. Signed-off-by: Mark Cave-Ayland Tested-by: Helge Deller Tested-by: Thomas Huth Message-Id: <20240112125420.514425-59-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 73c723afcc..75538f5859 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -823,25 +823,27 @@ void esp_command_complete(SCSIRequest *req, size_t re= sid) * Switch to status phase. For non-DMA transfers from the target the l= ast * byte is still in the FIFO */ - esp_set_phase(s, STAT_ST); - if (s->ti_size =3D=3D 0) { - /* - * Transfer complete: force TC to zero just in case a TI command w= as - * requested for more data than the command returns (Solaris 8 does - * this) - */ - esp_set_tc(s, 0); - esp_dma_ti_check(s); - } else { + s->ti_size =3D 0; + + switch (s->rregs[ESP_CMD]) { + case CMD_SEL | CMD_DMA: + case CMD_SEL: + case CMD_SELATN | CMD_DMA: + case CMD_SELATN: /* - * Transfer truncated: raise INTR_BS to indicate early change of - * phase + * No data phase for sequencer command so raise deferred bus servi= ce + * interrupt */ s->rregs[ESP_RINTR] |=3D INTR_BS; - esp_raise_irq(s); - s->ti_size =3D 0; + break; } =20 + /* Raise bus service interrupt to indicate change to STATUS phase */ + esp_set_phase(s, STAT_ST); + s->rregs[ESP_RINTR] |=3D INTR_BS; + esp_raise_irq(s); + esp_lower_drq(s); + if (s->current_req) { scsi_req_unref(s->current_req); s->current_req =3D NULL; --=20 2.39.2