From nobody Fri Oct 25 19:26:13 2024 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=1614897572; cv=none; d=zohomail.com; s=zohoarc; b=kCCVQefDa9xuStBxUfH7ibGEbTn55qPY/Z4mWYoMh4jfe03of4Vsr3Cv+smbjYgP5t4kIgw94DFNoLJYVybDKtyx3vVTwA9v+AqtN84GWdVzrNJoqvLJ4j12L7ELO00fpTRdUvHAcFQ9UJcj5KfS/WX/GoOjocB5EEDZC2E/sRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614897572; 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=B17IOI1zifANfcKwd9EdVUqxljnIJ9Kb1H1s+1Pinq4=; b=Z/TjHMraIGdbNYys3JzFYFKzqJWJPu3gd0alxGMD3nRv4C0mUV5Ic5+TGcbqoAXsWvmwtI56IJmeNypl49k/JgVt1+8TxE2R1/kHZy8lD4LtjOIhPpoZO9nYrKE66/IYtS/jCYt8eE/IaSONF37SktXGPMQZgqQeS/A+LADT0AU= 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 16148975727591010.2057229604949; Thu, 4 Mar 2021 14:39:32 -0800 (PST) Received: from localhost ([::1]:34580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHwd1-0002lY-Kw for importer@patchew.org; Thu, 04 Mar 2021 17:39:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHwE6-0008O1-7o for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:13:46 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:40168 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 1lHwE2-0006TW-Ov for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:13:46 -0500 Received: from host86-148-34-47.range86-148.btcentralplus.com ([86.148.34.47] 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 1lHwDu-0008MJ-VM; Thu, 04 Mar 2021 22:13:41 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Thu, 4 Mar 2021 22:10:48 +0000 Message-Id: <20210304221103.6369-28-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210304221103.6369-1-mark.cave-ayland@ilande.co.uk> References: <20210304221103.6369-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.34.47 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 27/42] esp: fix PDMA target selection 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" Currently the target selection for PDMA is done after the SCSI command has = been delivered which is not correct. Perform target selection as part of the ini= tial get_cmd() call when the command is submitted: if no target is present, don't raise DRQ. If the target is present then switch to the command phase since the MacOS t= oolbox ROM checks for this before attempting to submit the SCSI command. Signed-off-by: Mark Cave-Ayland Reviewed-by: Laurent Vivier --- hw/scsi/esp.c | 53 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index d8d7ede00a..10e63d1f62 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -243,6 +243,9 @@ static uint32_t get_cmd(ESPState *s) s->dma_memory_read(s->dma_opaque, buf, dmalen); } else { set_pdma(s, TI); + if (esp_select(s) < 0) { + return -1; + } esp_raise_drq(s); return 0; } @@ -257,7 +260,7 @@ static uint32_t get_cmd(ESPState *s) trace_esp_get_cmd(dmalen, target); =20 if (esp_select(s) < 0) { - return 0; + return -1; } return dmalen; } @@ -299,9 +302,6 @@ static void do_cmd(ESPState *s) =20 static void satn_pdma_cb(ESPState *s) { - if (esp_select(s) < 0) { - return; - } s->do_cmd =3D 0; if (s->cmdlen) { do_cmd(s); @@ -310,24 +310,28 @@ static void satn_pdma_cb(ESPState *s) =20 static void handle_satn(ESPState *s) { + int32_t cmdlen; + if (s->dma && !s->dma_enabled) { s->dma_cb =3D handle_satn; return; } s->pdma_cb =3D satn_pdma_cb; - s->cmdlen =3D get_cmd(s); - if (s->cmdlen) { + cmdlen =3D get_cmd(s); + if (cmdlen > 0) { + s->cmdlen =3D cmdlen; do_cmd(s); - } else { + } else if (cmdlen =3D=3D 0) { + s->cmdlen =3D 0; s->do_cmd =3D 1; + /* Target present, but no cmd yet - switch to command phase */ + s->rregs[ESP_RSEQ] =3D SEQ_CD; + s->rregs[ESP_RSTAT] =3D STAT_CD; } } =20 static void s_without_satn_pdma_cb(ESPState *s) { - if (esp_select(s) < 0) { - return; - } s->do_cmd =3D 0; if (s->cmdlen) { do_busid_cmd(s, s->cmdbuf, 0); @@ -336,24 +340,28 @@ static void s_without_satn_pdma_cb(ESPState *s) =20 static void handle_s_without_atn(ESPState *s) { + int32_t cmdlen; + if (s->dma && !s->dma_enabled) { s->dma_cb =3D handle_s_without_atn; return; } s->pdma_cb =3D s_without_satn_pdma_cb; - s->cmdlen =3D get_cmd(s); - if (s->cmdlen) { + cmdlen =3D get_cmd(s); + if (cmdlen > 0) { + s->cmdlen =3D cmdlen; do_busid_cmd(s, s->cmdbuf, 0); - } else { + } else if (cmdlen =3D=3D 0) { + s->cmdlen =3D 0; s->do_cmd =3D 1; + /* Target present, but no cmd yet - switch to command phase */ + s->rregs[ESP_RSEQ] =3D SEQ_CD; + s->rregs[ESP_RSTAT] =3D STAT_CD; } } =20 static void satn_stop_pdma_cb(ESPState *s) { - if (esp_select(s) < 0) { - return; - } s->do_cmd =3D 0; if (s->cmdlen) { trace_esp_handle_satn_stop(s->cmdlen); @@ -367,21 +375,28 @@ static void satn_stop_pdma_cb(ESPState *s) =20 static void handle_satn_stop(ESPState *s) { + int32_t cmdlen; + if (s->dma && !s->dma_enabled) { s->dma_cb =3D handle_satn_stop; return; } s->pdma_cb =3D satn_stop_pdma_cb; - s->cmdlen =3D get_cmd(s); - if (s->cmdlen) { + cmdlen =3D get_cmd(s); + if (cmdlen > 0) { trace_esp_handle_satn_stop(s->cmdlen); + s->cmdlen =3D cmdlen; s->do_cmd =3D 1; s->rregs[ESP_RSTAT] =3D STAT_TC | STAT_CD; s->rregs[ESP_RINTR] =3D INTR_BS | INTR_FC; s->rregs[ESP_RSEQ] =3D SEQ_CD; esp_raise_irq(s); - } else { + } else if (cmdlen =3D=3D 0) { + s->cmdlen =3D 0; s->do_cmd =3D 1; + /* Target present, but no cmd yet - switch to command phase */ + s->rregs[ESP_RSEQ] =3D SEQ_CD; + s->rregs[ESP_RSTAT] =3D STAT_CD; } } =20 --=20 2.20.1