From patchwork Tue May 17 11:00:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 95913 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 54888B6EF1 for ; Tue, 17 May 2011 21:07:00 +1000 (EST) Received: from localhost ([::1]:37056 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMI74-0003Tx-Hp for incoming@patchwork.ozlabs.org; Tue, 17 May 2011 07:06:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMI2p-0005bG-T8 for qemu-devel@nongnu.org; Tue, 17 May 2011 07:03:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMI27-00050u-Sg for qemu-devel@nongnu.org; Tue, 17 May 2011 07:02:31 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:62390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMI27-0004zX-NA for qemu-devel@nongnu.org; Tue, 17 May 2011 07:01:47 -0400 Received: by mail-iy0-f173.google.com with SMTP id 10so365615iym.4 for ; Tue, 17 May 2011 04:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=3HD6UlyYxh66lPoqYauKFREFpY6XW09PLDcZHP9FUBE=; b=OZZb0rbc5ogLbYpAG7w4uFjlCxbrAwZArh3FX/ciO4vAZdM4oj55TLNHJc5ssxEtm5 6kdqFfMmk5OS2/3iJSFvsLgbb3yVzaaHe8LIcR5/Fg+qjwM6b7O4qJCrnBKF/i5e1RVg jOQtwodU4mGtNBZ6wkEbxrfLU3E+9YH4awltM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=FDeI0DqTqLUjiHDbubSaDNJTsRBYpurti8nZAuZDP+D2zm2TmqBmBMn2tK2jgx3AUQ ePK60kJ6L4hQzZzTqYaIx+Y95J/cMIz6nkzfngHfNlcb9PTrwkEerpXgcW39JNf1e1y3 OMQnFk4lKcBH+fHqBVI7HXyCmJG+pfRL+WrvY= Received: by 10.42.240.1 with SMTP id ky1mr541958icb.156.1305630107423; Tue, 17 May 2011 04:01:47 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id c16sm211390ibe.41.2011.05.17.04.01.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 May 2011 04:01:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 17 May 2011 13:00:52 +0200 Message-Id: <1305630067-2119-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1305630067-2119-1-git-send-email-pbonzini@redhat.com> References: <1305630067-2119-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Subject: [Qemu-devel] [PATCH v3 06/21] lsi: extract lsi_find_by_tag 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Christoph Hellwig --- hw/lsi53c895a.c | 63 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 25 deletions(-) diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index ccea6ad..3b67155 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -652,38 +652,51 @@ static void lsi_reselect(LSIState *s, lsi_request *p) } } -/* Record that data is available for a queued command. Returns zero if - the device was reselected, nonzero if the IO is deferred. */ -static int lsi_queue_tag(LSIState *s, uint32_t tag, uint32_t arg) +static lsi_request *lsi_find_by_tag(LSIState *s, uint32_t tag) { lsi_request *p; QTAILQ_FOREACH(p, &s->queue, next) { if (p->tag == tag) { - if (p->pending) { - BADF("Multiple IO pending for tag %d\n", tag); - } - p->pending = arg; - /* Reselect if waiting for it, or if reselection triggers an IRQ - and the bus is free. - Since no interrupt stacking is implemented in the emulation, it - is also required that there are no pending interrupts waiting - for service from the device driver. */ - if (s->waiting == 1 || - (lsi_irq_on_rsl(s) && !(s->scntl1 & LSI_SCNTL1_CON) && - !(s->istat0 & (LSI_ISTAT0_SIP | LSI_ISTAT0_DIP)))) { - /* Reselect device. */ - lsi_reselect(s, p); - return 0; - } else { - DPRINTF("Queueing IO tag=0x%x\n", tag); - p->pending = arg; - return 1; - } + return p; } } - BADF("IO with unknown tag %d\n", tag); - return 1; + + return NULL; +} + +/* Record that data is available for a queued command. Returns zero if + the device was reselected, nonzero if the IO is deferred. */ +static int lsi_queue_tag(LSIState *s, uint32_t tag, uint32_t arg) +{ + lsi_request *p; + + p = lsi_find_by_tag(s, tag); + if (!p) { + BADF("IO with unknown tag %d\n", tag); + return 1; + } + + if (p->pending) { + BADF("Multiple IO pending for tag %d\n", tag); + } + p->pending = arg; + /* Reselect if waiting for it, or if reselection triggers an IRQ + and the bus is free. + Since no interrupt stacking is implemented in the emulation, it + is also required that there are no pending interrupts waiting + for service from the device driver. */ + if (s->waiting == 1 || + (lsi_irq_on_rsl(s) && !(s->scntl1 & LSI_SCNTL1_CON) && + !(s->istat0 & (LSI_ISTAT0_SIP | LSI_ISTAT0_DIP)))) { + /* Reselect device. */ + lsi_reselect(s, p); + return 0; + } else { + DPRINTF("Queueing IO tag=0x%x\n", tag); + p->pending = arg; + return 1; + } } /* Callback to indicate that the SCSI layer has completed a transfer. */