From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGPUa-0007nw-4T for qemu-devel@nongnu.org; Thu, 20 Feb 2014 04:00:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGPUV-0004PU-Os for qemu-devel@nongnu.org; Thu, 20 Feb 2014 04:00:28 -0500 Received: from s16892447.onlinehome-server.info ([82.165.15.123]:34894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGPUV-0004PM-A0 for qemu-devel@nongnu.org; Thu, 20 Feb 2014 04:00:23 -0500 Message-ID: <5305C3B2.7020800@ilande.co.uk> Date: Thu, 20 Feb 2014 08:58:26 +0000 From: Mark Cave-Ayland MIME-Version: 1.0 References: <53014626.20009@caramail.com> In-Reply-To: <53014626.20009@caramail.com> Content-Type: multipart/mixed; boundary="------------030908080402000508070702" Subject: Re: [Qemu-devel] [PATCH] Sun4m : SCSI ESP controller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Olivier Danet Cc: Blue Swirl , qemu-devel , Artyom Tarasenko This is a multi-part message in MIME format. --------------030908080402000508070702 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 16/02/14 23:13, Olivier Danet wrote: > Two small fixes for the ESP (AM53C94) SCSI controller > > * Signal the end of the DMA transfer after a SCSI command. > > * The status register (RSTAT) is cleared after reading the interrupt > status register (RINTR), except for the TC bit (=Count To Zero) and the > scsi phase bits, which mirror SCSI signals levels. > > Fixes the bug "esp0: !TC on DATA XFER" with NetBSD > https://bugs.launchpad.net/qemu/+bug/1055090 > > Signed-off-by: Olivier Danet > --- > hw/scsi/esp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c > index 2d150bf..5e91077 100644 > --- a/hw/scsi/esp.c > +++ b/hw/scsi/esp.c > @@ -246,6 +246,7 @@ static void esp_do_dma(ESPState *s) > s->cmdlen = 0; > s->do_cmd = 0; > do_cmd(s, s->cmdbuf); > + esp_dma_done(s); > return; > } > if (s->async_len == 0) { > @@ -417,10 +418,9 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr) > except TC */ > old_val = s->rregs[ESP_RINTR]; > s->rregs[ESP_RINTR] = 0; > - s->rregs[ESP_RSTAT] &= ~STAT_TC; > s->rregs[ESP_RSEQ] = SEQ_CD; > esp_lower_irq(s); > - > + s->rregs[ESP_RSTAT] &= STAT_TC | STAT_MI; > return old_val; > default: > break; Hi Olivier, I've applied the non-whitespace damaged patch (attached) but unfortunately I still see the "!TC on DATA XFER" bug with my NetBSD 5 ISO under qemu-system-sparc :/ Note that the second part of the patch showed some fuzz so I'm wondering if this patch is complete or whether part of it is still missing? Also ESP patches should have an esp or scsi/esp prefix in the subject line and should CC the current SCSI maintainer (see MAINTAINERS file) which is currently Paolo. HTH, Mark. --------------030908080402000508070702 Content-Type: text/x-diff; name="esp.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="esp.patch" Return-Path: Delivered-To: unknown Received: from mail.ilande.co.uk (82.165.15.123:995) by mca-desktop with POP3-SSL; 16 Feb 2014 23:15:04 -0000 Envelope-to: mark.cave-ayland@ilande.co.uk Delivery-date: Sun, 16 Feb 2014 23:13:20 +0000 Received: from lists.gnu.org ([208.118.235.17]) by s16892447.onlinehome-server.info with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WFAth-0002KD-0Y for mark.cave-ayland@ilande.co.uk; Sun, 16 Feb 2014 23:13:19 +0000 Received: from localhost ([::1]:35381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFAtZ-0005sM-EF for mark.cave-ayland@ilande.co.uk; Sun, 16 Feb 2014 18:13:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFAsk-0004o1-Ca for qemu-devel@nongnu.org; Sun, 16 Feb 2014 18:12:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFAsf-0004UU-4E for qemu-devel@nongnu.org; Sun, 16 Feb 2014 18:12:18 -0500 Received: from mout.gmx.net ([212.227.15.18]:50241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFAse-0004UQ-RR for qemu-devel@nongnu.org; Sun, 16 Feb 2014 18:12:13 -0500 Received: from [192.168.1.24] ([90.38.117.132]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0MZwYd-1WaHhN2a3L-00LpC4 for ; Mon, 17 Feb 2014 00:12:11 +0100 Message-ID: <53014626.20009@caramail.com> Date: Mon, 17 Feb 2014 00:13:42 +0100 From: Olivier Danet User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: qemu-devel , Blue Swirl , Mark Cave-Ayland , Artyom Tarasenko Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:dTf3Ng2SR2hoC84GUEPPGIG7swVLITC+kwoZJU1NPn1G0hz/d99 GriJbXlzO8YZlcJk/hIKyyMkLyqBI/uXSxagybTB2BdC/cgkZgFCe0O8RnMpUvEsp+MzL7W YmHmlDOhgAWB8zqJK+AYngRp3AnDmHxUdIXdO7Qi506pLWUotz5BlBBls4TfBbIvA5WbFpz XbbXBYD0tM0RA5iD8LA4A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.15.18 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Mailman-Copy: yes Errors-To: qemu-devel-bounces+mark.cave-ayland=ilande.co.uk@nongnu.org Sender: qemu-devel-bounces+mark.cave-ayland=ilande.co.uk@nongnu.org X-SA-Exim-Connect-IP: 208.118.235.17 X-SA-Exim-Mail-From: qemu-devel-bounces+mark.cave-ayland=ilande.co.uk@nongnu.org X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on s16892447.onlinehome-server.info X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,SPF_PASS autolearn=ham version=3.3.2 Subject: [Qemu-devel] [PATCH] Sun4m : SCSI ESP controller X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) Two small fixes for the ESP (AM53C94) SCSI controller * Signal the end of the DMA transfer after a SCSI command. * The status register (RSTAT) is cleared after reading the interrupt status register (RINTR), except for the TC bit (=Count To Zero) and the scsi phase bits, which mirror SCSI signals levels. Fixes the bug "esp0: !TC on DATA XFER" with NetBSD https://bugs.launchpad.net/qemu/+bug/1055090 Signed-off-by: Olivier Danet --- hw/scsi/esp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 2d150bf..5e91077 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -246,6 +246,7 @@ static void esp_do_dma(ESPState *s) s->cmdlen = 0; s->do_cmd = 0; do_cmd(s, s->cmdbuf); + esp_dma_done(s); return; } if (s->async_len == 0) { @@ -417,10 +418,9 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr) except TC */ old_val = s->rregs[ESP_RINTR]; s->rregs[ESP_RINTR] = 0; - s->rregs[ESP_RSTAT] &= ~STAT_TC; s->rregs[ESP_RSEQ] = SEQ_CD; esp_lower_irq(s); - + s->rregs[ESP_RSTAT] &= STAT_TC | STAT_MI; return old_val; default: break; -- 1.8.1.5 --------------030908080402000508070702--