From patchwork Wed Jun 13 04:46:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 164535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 113FAB6FF7 for ; Wed, 13 Jun 2012 15:25:25 +1000 (EST) Received: from localhost ([::1]:55454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Seg54-00056l-UX for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2012 01:25:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLx-0007wg-D8 for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SefLv-00087p-Kc for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:44 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:42162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLv-0007uz-Eq for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:43 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1836767pbb.4 for ; Tue, 12 Jun 2012 21:38:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=9SYajWv0YE7O0JrDAuMnUoafNhnDn3wxmMNnmNE7A2o=; b=eOBd4GKWxWei1U+0gP6HhZ0YVTqN+WgzKB2twQJiyIS6Dyd8IQCJ2gyQJL9pLEw1ij lhrq41yzYy9T4ihmZHZiOMyU/XYWi7R3RcraX2NZcV67r3WGjA6Pl1Y/ikVnwxwTdnzy BiQeBHJjGWNSiWeJ1tJdZnPRqQUFJLvqWWdBKm9ao7oA21xsENp181Y4lIV93EPevqR3 c7j5cFjpp+eSM7WeSmxPnyXO9QGuS4BWg1svuGWDOMCA3HVPkZTY4eILUMFl74EtbU/u asiuQmUUcCy0Px0ZZ6fYYYBIwxKnfIbAbQTUcy/qzlSuZCXnvGuAFxnI19NxaB9HnMsZ t70A== Received: by 10.68.237.74 with SMTP id va10mr46303704pbc.46.1339562322245; Tue, 12 Jun 2012 21:38:42 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id oy8sm4364996pbc.52.2012.06.12.21.38.38 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 21:38:41 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Wed, 13 Jun 2012 14:46:50 +1000 Message-Id: <8ca36357edb19bbe9098de64691418f627a7a354.1339562634.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQl38txpKO+BkZ2QnHB607vl7FNpio0bbCZQs0ASjKwfj4M5gKYgQ38zr9tIMbev6P4Tn5ql X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: peter.crosthwaite@petalogix.com, monstr@monstr.eu, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH v2 10/11] xilinx_axidma: (un)reversed irq initialisation 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 The axidma irq orders are reversed in both the device model and the instantion. Undid both reversal (for no net change). Also needs to be reversed for consistency with Xilinx tools IRQ listing. Signed-off-by: Peter A. G. Crosthwaite --- hw/xilinx.h | 4 ++-- hw/xilinx_axidma.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 52fce01..8f915b4 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -81,8 +81,8 @@ xilinx_axiethernetdma_create(void *dmach, qdev_init_nofail(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); - sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq2); - sysbus_connect_irq(sysbus_from_qdev(dev), 1, irq); + sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); + sysbus_connect_irq(sysbus_from_qdev(dev), 1, irq2); return dev; } diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c index 85dfcbf..59373b5 100644 --- a/hw/xilinx_axidma.c +++ b/hw/xilinx_axidma.c @@ -463,8 +463,8 @@ static int xilinx_axidma_init(SysBusDevice *dev) struct XilinxAXIDMA *s = FROM_SYSBUS(typeof(*s), dev); int i; - sysbus_init_irq(dev, &s->streams[1].irq); sysbus_init_irq(dev, &s->streams[0].irq); + sysbus_init_irq(dev, &s->streams[1].irq); if (!s->dmach) { hw_error("Unconnected DMA channel.\n");