From nobody Sat Sep 21 05:46:37 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 1705065552204867.2861085693563; Fri, 12 Jan 2024 05:19:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOHOe-0004zv-E9; Fri, 12 Jan 2024 08:16:28 -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 1rOHOF-0004VW-RI for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:16:05 -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 1rOHOE-00006I-29 for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:16:03 -0500 Received: from [2a02:8012:c93d:0:260e:bf57:a4e9:8142] (helo=cheesecake.fritz.box) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rOHNL-0009Gy-3i; Fri, 12 Jan 2024 13:15:08 +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=FRkn+/5vqEfPb5/vhvhcQRjljumahQtc+h05lqCfuTU=; b=hNuxj+2zbcqSho1v7eVZE9JV/t CGWUgKwcMdlLV7m8ICJkzZMNXQWPp6PJj2KAxF1I87ZuO73f5xfs06D3KSEFHRG7Ht7QfxIm4wZZT XV7qhz4yIVEkTyhIoirQqjgUCNoKwULr2tJC3NeWEH0bRRtyMzBTPfvasP7ghRScqRcfKXEqvO6IM iYjFqw7wMpGForvUcnWr53tLUoelPW3bN1cohfUJ9j3noCTZ4gBsSa43nNcsYWk5aulU2amP2laBi XNso3EaT+F0H5GYZCZnXoJ8jz07FdNYN9+byulYvBxJ7Lpqzwgr7lobfRdVm3/goysqaySSwxNaiv 3MqyJ63HtXp907VnlKz49MI0nqqBByLHGIqBC/gLaFyLskPlbalmv30C9lOsbxd+5fYtY6K7orpDs tzWKJq2Ag5dRLSjeK9M+HVPietuFu72KMD65K4kfX7CWQSH72OyVVubowrLVRO5x353oOxn21hxNv RxvsRVHhF3SVrfj+kkJFlRuNZiUwDXgQsG5+R2JOVk/RjPKx+YZrAQiJR6+N8miKa+x1UiWoVkvr8 rKjdeEswb+heefOgc2nNd7z5AmtnVdKJYI1gb46YaijjKdihMrkGxQLGw+6RjAihRZvBzkgORSOJE 5auBT5swekYD6OkmUNTiWNEN2U3vVmEldLdcOyMyo=; From: Mark Cave-Ayland To: pbonzini@redhat.com, fam@euphon.net, hpoussin@reactos.org, deller@gmx.de, linux@roeck-us.net, qemu-devel@nongnu.org Date: Fri, 12 Jan 2024 13:15:26 +0000 Message-Id: <20240112131529.515642-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240112131529.515642-1-mark.cave-ayland@ilande.co.uk> References: <20240112131529.515642-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a02:8012:c93d:0:260e:bf57:a4e9:8142 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 1/4] esp-pci.c: use correct address register for PCI DMA transfers 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: 1705065553636100005 Content-Type: text/plain; charset="utf-8" The current code in esp_pci_dma_memory_rw() sets the DMA address to the val= ue of the DMA_SPA (Starting Physical Address) register which is incorrect: this means that for each callback from the SCSI layer the DMA address is set back to the starting address. In the case where only a single SCSI callback occurs (currently for transfer lengths < 128kB) this works fine, however for larger transfers the DMA addr= ess wraps back to the initial starting address, corrupting the buffer holding t= he data transferred to the guest. Fix esp_pci_dma_memory_rw() to use the DMA_WAC (Working Address Counter) for the DMA address which is correctly incremented across multiple SCSI layer transfers. Signed-off-by: Mark Cave-Ayland Reviewed-by: Guenter Roeck Tested-by: Guenter Roeck --- hw/scsi/esp-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 93b3429e0f..7117725371 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -275,7 +275,7 @@ static void esp_pci_dma_memory_rw(PCIESPState *pci, uin= t8_t *buf, int len, qemu_log_mask(LOG_UNIMP, "am53c974: MDL transfer not implemented\n= "); } =20 - addr =3D pci->dma_regs[DMA_SPA]; + addr =3D pci->dma_regs[DMA_WAC]; if (pci->dma_regs[DMA_WBC] < len) { len =3D pci->dma_regs[DMA_WBC]; } --=20 2.39.2 From nobody Sat Sep 21 05:46:37 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 1705065586563407.6476563485884; Fri, 12 Jan 2024 05:19:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOHOF-0004R1-Fv; Fri, 12 Jan 2024 08:16:04 -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 1rOHO5-0003zA-5o for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:15:54 -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 1rOHO3-0008Ng-H1 for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:15:52 -0500 Received: from [2a02:8012:c93d:0:260e:bf57:a4e9:8142] (helo=cheesecake.fritz.box) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rOHNN-0009Gy-1x; Fri, 12 Jan 2024 13:15:13 +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=clhDSjKwvvLWs0WuVzpbQyYiAfdqFG7d8092GY9OHes=; b=Hsbp6+AJ0wCjeQRFY7ZI4tcXt/ +23tdyjo44oxvE7qOz5XWev6txdeGawyDOc0o9A9NXZdrJXfTkJAPUrXZPl3mNGX6PrOu3xykwss+ VoXPDYv2ABxwaL7awUlSl/qob7ChfEp3gSWgW9d48QhiRKBuTV97dd4VdieSnDm7uNPtgwGWVPS05 wZXA7xOskul8lVbbKV4iGsE72eOOkQN3xRsglc6vps/uPJxkYb5jfi4j7VoWDm2merRfS+ZcbMKtE 93lSHiAawpltWwRAVnGyyKnoDUBP2iQkGBFQgm2p6boBwcy/ol0C2ozrcxJjhumU3CHBJs9XE51hI QTLd8dngOqI+gfk9XhuN7xgOZ9NuTybwnW3NOdcEsnu49oY/U6XhoIzj9GQ1IomzZ88oMnjK+3nfc 88gO1aJ7ZfS9HGaZ1MB2ytyUcXIjLeViKU5myGBX8NPJsN6sEBoqMVrLzO0q70t0l6jpETSJJsUeC Isyrv6KjpST3gm20dthTopmMFxKlmoxX+0Z3jKOULmli/hSDYAU/7AArdvope2P+ds/dCTU+xLJfJ L7Va8tSW7+3VIx6GlNHhPoPDidFWhJN/KwHPoUjXoV010q53TGORLEggqaPjXZ+bKhc6F0wIsVQr2 27LsrHtOeUGPJfTwOCx1nvh/B21ihpy3UqxoSG7EM=; From: Mark Cave-Ayland To: pbonzini@redhat.com, fam@euphon.net, hpoussin@reactos.org, deller@gmx.de, linux@roeck-us.net, qemu-devel@nongnu.org Date: Fri, 12 Jan 2024 13:15:27 +0000 Message-Id: <20240112131529.515642-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240112131529.515642-1-mark.cave-ayland@ilande.co.uk> References: <20240112131529.515642-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a02:8012:c93d:0:260e:bf57:a4e9:8142 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 2/4] esp-pci.c: generate PCI interrupt from separate ESP and PCI sources 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: 1705065587876100001 Content-Type: text/plain; charset="utf-8" The am53c974/dc390 PCI interrupt has two separate sources: the first is fro= m the internal ESP device, and the second is from the PCI DMA transfer logic. Update the ESP interrupt handler so that it sets DMA_STAT_SCSIINT rather th= an driving the PCI IRQ directly, and introduce a new esp_pci_update_irq() func= tion to generate the correct PCI IRQ level. In particular this fixes spurious in= terrupts being generated by setting DMA_STAT_DONE at the end of a transfer if DMA_CM= D_INTE_D isn't set in the DMA_CMD register. Signed-off-by: Mark Cave-Ayland Reviewed-by: Guenter Roeck Tested-by: Guenter Roeck --- hw/scsi/esp-pci.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 7117725371..15dc3c004d 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -77,6 +77,29 @@ struct PCIESPState { ESPState esp; }; =20 +static void esp_pci_update_irq(PCIESPState *pci) +{ + int scsi_level =3D !!(pci->dma_regs[DMA_STAT] & DMA_STAT_SCSIINT); + int dma_level =3D (pci->dma_regs[DMA_CMD] & DMA_CMD_INTE_D) ? + !!(pci->dma_regs[DMA_STAT] & DMA_STAT_DONE) : 0; + int level =3D scsi_level || dma_level; + + pci_set_irq(PCI_DEVICE(pci), level); +} + +static void esp_irq_handler(void *opaque, int irq_num, int level) +{ + PCIESPState *pci =3D PCI_ESP(opaque); + + if (level) { + pci->dma_regs[DMA_STAT] |=3D DMA_STAT_SCSIINT; + } else { + pci->dma_regs[DMA_STAT] &=3D ~DMA_STAT_SCSIINT; + } + + esp_pci_update_irq(pci); +} + static void esp_pci_handle_idle(PCIESPState *pci, uint32_t val) { ESPState *s =3D &pci->esp; @@ -151,6 +174,7 @@ static void esp_pci_dma_write(PCIESPState *pci, uint32_= t saddr, uint32_t val) /* clear some bits on write */ uint32_t mask =3D DMA_STAT_ERROR | DMA_STAT_ABORT | DMA_STAT_D= ONE; pci->dma_regs[DMA_STAT] &=3D ~(val & mask); + esp_pci_update_irq(pci); } break; default: @@ -161,17 +185,14 @@ static void esp_pci_dma_write(PCIESPState *pci, uint3= 2_t saddr, uint32_t val) =20 static uint32_t esp_pci_dma_read(PCIESPState *pci, uint32_t saddr) { - ESPState *s =3D &pci->esp; uint32_t val; =20 val =3D pci->dma_regs[saddr]; if (saddr =3D=3D DMA_STAT) { - if (s->rregs[ESP_RSTAT] & STAT_INT) { - val |=3D DMA_STAT_SCSIINT; - } if (!(pci->sbac & SBAC_STATUS)) { pci->dma_regs[DMA_STAT] &=3D ~(DMA_STAT_ERROR | DMA_STAT_ABORT= | DMA_STAT_DONE); + esp_pci_update_irq(pci); } } =20 @@ -350,6 +371,7 @@ static void esp_pci_command_complete(SCSIRequest *req, = size_t resid) esp_command_complete(req, resid); pci->dma_regs[DMA_WBC] =3D 0; pci->dma_regs[DMA_STAT] |=3D DMA_STAT_DONE; + esp_pci_update_irq(pci); } =20 static const struct SCSIBusInfo esp_pci_scsi_info =3D { @@ -386,7 +408,7 @@ static void esp_pci_scsi_realize(PCIDevice *dev, Error = **errp) "esp-io", 0x80); =20 pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &pci->io); - s->irq =3D pci_allocate_irq(dev); + s->irq =3D qemu_allocate_irq(esp_irq_handler, pci, 0); =20 scsi_bus_init(&s->bus, sizeof(s->bus), d, &esp_pci_scsi_info); } --=20 2.39.2 From nobody Sat Sep 21 05:46:37 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 1705065497906333.45108210838634; Fri, 12 Jan 2024 05:18:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOHOk-0005H3-Np; Fri, 12 Jan 2024 08:16:35 -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 1rOHO8-00048A-HX for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:15:58 -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 1rOHO5-0008Ot-Kq for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:15:55 -0500 Received: from [2a02:8012:c93d:0:260e:bf57:a4e9:8142] (helo=cheesecake.fritz.box) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rOHNR-0009Gy-BX; Fri, 12 Jan 2024 13:15:13 +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=rtIL/xArmXp0Q2gT0KvSPBmNZgN/sj4zdhvxT3nWGFo=; b=iuMlAdohPt7IeAlMiye9mGGKCk swW3dSKndKr2yO4OyKjxkOAt9yiq1rkbwDlFoyouIVSkz2DaovzBTOADks5ORr9FY8tvTgfyxYPhn brvpbCq+SOGTtJgoSddL4SRemnh8ii5npwpxXEQqvAqyR2XopkJU6hQ752Zqc7n9CBpL9hVfDDF9m dvnbYKdpBXtItV9LZLIf2tuvxi8Wd9WURYxBj3sgt29QIsT7HI7fRvg9mQKxS6OW+QYr1WXyZjLA/ IKaHvsJq068+0Ck8CZO9Cd2g6sGYb6GYQXRJnKBHY3rx0MKPdtRXYwbl4OHeZfh+CLJT/rpsHTcMW 41BAXizVqswoN13mS5n6AekSTkqgDqVcNTM19GCrU2h2wJG2X2rAF30MntVQDVpTuH2TEcu8FxXUR zCbWfdaX5T8Kv7zRQaAGz7SEL+raUh8UXlHTawGzhCGkVjzoa3+Wy3U7D+CLKWXMcZg+I2AlWIk0K mAV3EQqSaZBtw6UMhTFrwcbGUohv5LVOkpX0oyrPuM4VYZN0YeP8a/sg/YRbXrsP6tP1MmmX10+ea cTS0oZMWBqqeBn0oBFZOk8T0DgsCaGFl7E1w+2Uo9HssquPi09F+RcOKeYu72Mht9d064ix2Bxfyo XDE+r0hxByBasdLIac49TIjbTpqBEpPVqOf1alVYI=; From: Mark Cave-Ayland To: pbonzini@redhat.com, fam@euphon.net, hpoussin@reactos.org, deller@gmx.de, linux@roeck-us.net, qemu-devel@nongnu.org Date: Fri, 12 Jan 2024 13:15:28 +0000 Message-Id: <20240112131529.515642-4-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240112131529.515642-1-mark.cave-ayland@ilande.co.uk> References: <20240112131529.515642-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a02:8012:c93d:0:260e:bf57:a4e9:8142 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 3/4] esp-pci.c: synchronise setting of DMA_STAT_DONE with ESP completion interrupt 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: 1705065499497100001 Content-Type: text/plain; charset="utf-8" The setting of DMA_STAT_DONE at the end of a DMA transfer can be configured= to generate an interrupt, however the Linux driver manually checks for DMA_STA= T_DONE being set and if it is, considers that a DMA transfer has completed. If DMA_STAT_DONE is set but the ESP device isn't indicating an interrupt th= en the Linux driver considers this to be a spurious interrupt. However this can occur in QEMU as there is a delay between the end of DMA transfer where DMA_STAT_DONE is set, and the ESP device raising its completion interrupt. This appears to be an incorrect assumption in the Linux driver as the ESP a= nd PCI DMA interrupt sources are separate (and may not be raised exactly together), however we can work around this by synchronising the setting of DMA_STAT_DONE at the end of a DMA transfer with the ESP completion interrup= t. In conjunction with the previous commit Linux is now able to correctly boot from an am53c974 PCI SCSI device on the hppa C3700 machine without emitting "iget: checksum invalid" and "Spurious irq, sreg=3D10" errors. Signed-off-by: Mark Cave-Ayland Reviewed-by: Guenter Roeck Tested-by: Guenter Roeck --- hw/scsi/esp-pci.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 15dc3c004d..875a49199d 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -93,6 +93,18 @@ static void esp_irq_handler(void *opaque, int irq_num, i= nt level) =20 if (level) { pci->dma_regs[DMA_STAT] |=3D DMA_STAT_SCSIINT; + + /* + * If raising the ESP IRQ to indicate end of DMA transfer, set + * DMA_STAT_DONE at the same time. In theory this should be done in + * esp_pci_dma_memory_rw(), however there is a delay between setti= ng + * DMA_STAT_DONE and the ESP IRQ arriving which is visible to the + * guest that can cause confusion e.g. Linux + */ + if ((pci->dma_regs[DMA_CMD] & DMA_CMD_MASK) =3D=3D 0x3 && + pci->dma_regs[DMA_WBC] =3D=3D 0) { + pci->dma_regs[DMA_STAT] |=3D DMA_STAT_DONE; + } } else { pci->dma_regs[DMA_STAT] &=3D ~DMA_STAT_SCSIINT; } @@ -306,9 +318,6 @@ static void esp_pci_dma_memory_rw(PCIESPState *pci, uin= t8_t *buf, int len, /* update status registers */ pci->dma_regs[DMA_WBC] -=3D len; pci->dma_regs[DMA_WAC] +=3D len; - if (pci->dma_regs[DMA_WBC] =3D=3D 0) { - pci->dma_regs[DMA_STAT] |=3D DMA_STAT_DONE; - } } =20 static void esp_pci_dma_memory_read(void *opaque, uint8_t *buf, int len) @@ -363,24 +372,13 @@ static const VMStateDescription vmstate_esp_pci_scsi = =3D { } }; =20 -static void esp_pci_command_complete(SCSIRequest *req, size_t resid) -{ - ESPState *s =3D req->hba_private; - PCIESPState *pci =3D container_of(s, PCIESPState, esp); - - esp_command_complete(req, resid); - pci->dma_regs[DMA_WBC] =3D 0; - pci->dma_regs[DMA_STAT] |=3D DMA_STAT_DONE; - esp_pci_update_irq(pci); -} - static const struct SCSIBusInfo esp_pci_scsi_info =3D { .tcq =3D false, .max_target =3D ESP_MAX_DEVS, .max_lun =3D 7, =20 .transfer_data =3D esp_transfer_data, - .complete =3D esp_pci_command_complete, + .complete =3D esp_command_complete, .cancel =3D esp_request_cancelled, }; =20 --=20 2.39.2 From nobody Sat Sep 21 05:46:37 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 1705065524994159.3056956371446; Fri, 12 Jan 2024 05:18:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOHOO-0004fp-0N; Fri, 12 Jan 2024 08:16:12 -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 1rOHO8-000489-Dc for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:15:58 -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 1rOHO6-0008Qm-CL for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:15:55 -0500 Received: from [2a02:8012:c93d:0:260e:bf57:a4e9:8142] (helo=cheesecake.fritz.box) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rOHNR-0009Gy-S7; Fri, 12 Jan 2024 13:15:17 +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=cPFSvw0wPN9INdytdMaa3N76yZW184wgmgBIri0iNeg=; b=fg2rpQnwN+JJ1TKdoZEvviTY9T lFhUnLyLxunOXKLPWZOxzckRqeEYWuVEEAJ86cSfEIzprpX+t6N83kf3JM62CaOrF6/8bnEHobs4W 8Ffvy4dp9SfU6YLTUsNEzoU07/voVRH0SigdlcUcR/B4KjuWhOl9NUcz9qG7Q9YxfyhZxLteF96bw OAGWBftordJBs4z4LBn2vbYbmvEfavIWYXy9tN4MLbYLkVDVwSj9AgcVaxFesPAFawHCY8WAAOPwn OH2W616dHolu9jijkOHneM7P1V4sCwBOe+fwJmhKpn/3qc4dW/J+lj7kRoTz/efey/5T7mWo53YBw g5DJZDxIDm6bUtCcjA4fQtFqWFy1XNhcGI/8PpKVRg+2h8td1oyCracVBPMuSHBpGpiufMj/GmO5U a/iUEhgDlmE3E7obm4U63JdkNtGM/WWuTn1pBKgFAhyK62LE6Fv6KuNwBltv5ncEfgPj622qZxYL6 4JzeDfMrQKi6DE30zFHYN9F8Ww4OFuii4474YG7lT7hJQmyJgADft2zwoEHOqSHMtCWM3EarQFO5p zINCgC5AX2rNmlvqymXXCjh7z+pq1ISfudPs+Rv4VQi4iE6zkTiNXAwIG7rdYI8ssbEI1cTnhmLwf FfzvgXVWZdpa8kzAr67YZ02Qje3s1pVqU/6VnPWzk=; From: Mark Cave-Ayland To: pbonzini@redhat.com, fam@euphon.net, hpoussin@reactos.org, deller@gmx.de, linux@roeck-us.net, qemu-devel@nongnu.org Date: Fri, 12 Jan 2024 13:15:29 +0000 Message-Id: <20240112131529.515642-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240112131529.515642-1-mark.cave-ayland@ilande.co.uk> References: <20240112131529.515642-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a02:8012:c93d:0:260e:bf57:a4e9:8142 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 4/4] esp-pci.c: set DMA_STAT_BCMBLT when BLAST command issued 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: 1705065525618100001 Content-Type: text/plain; charset="utf-8" Even though the BLAST command isn't fully implemented in QEMU, the DMA_STAT= _BCMBLT bit should be set after the command has been issued to indicate that the co= mmand has completed. This fixes an issue with the DC390 DOS driver which issues the BLAST comman= d as part of its normal error recovery routine at startup, and otherwise sits in= a tight loop waiting for DMA_STAT_BCMBLT to be set before continuing. Signed-off-by: Mark Cave-Ayland Reviewed-by: Guenter Roeck Tested-by: Guenter Roeck --- hw/scsi/esp-pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 875a49199d..42d9d2e483 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -124,6 +124,7 @@ static void esp_pci_handle_blast(PCIESPState *pci, uint= 32_t val) { trace_esp_pci_dma_blast(val); qemu_log_mask(LOG_UNIMP, "am53c974: cmd BLAST not implemented\n"); + pci->dma_regs[DMA_STAT] |=3D DMA_STAT_BCMBLT; } =20 static void esp_pci_handle_abort(PCIESPState *pci, uint32_t val) --=20 2.39.2