From patchwork Sat May 12 09:15:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 158726 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 3C85FB701D for ; Sat, 12 May 2012 19:19:04 +1000 (EST) Received: from localhost ([::1]:52223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ST8Td-0006ej-Sq for incoming@patchwork.ozlabs.org; Sat, 12 May 2012 05:19:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ST8TN-0006F1-7I for qemu-devel@nongnu.org; Sat, 12 May 2012 05:18:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ST8TL-0006g1-KN for qemu-devel@nongnu.org; Sat, 12 May 2012 05:18:44 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:63527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ST8TL-0006eJ-BE for qemu-devel@nongnu.org; Sat, 12 May 2012 05:18:43 -0400 Received: by mail-bk0-f45.google.com with SMTP id j10so3106760bkw.4 for ; Sat, 12 May 2012 02:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references; bh=L5GvAp3Z+yPnpHjswAPCZzFm0n4f1XAO7yrpNr/h70Y=; b=nbyaR3CQg8DLXb6evu8XyfxOEaS/+sgkvGtb4/h/wBxuYEVTHaZaqrZuURUrrYtb0/ U+0QKJFsROlzlmhsVS6mXJkzHBEvapbWUrYSHzjjQcgX51Pq5flx87Is6ANS9TUrUVZ7 gWEfEn8mmMoh2ayf8/UWm0YgmDoWdBUDAxblewPQm0VQjtS01ijQoLRtAMnrxolT2PV4 ZcgUW07+jDhyoNcpbzvRcnujz/rHTiojL2RVBKVP2HqAGH/1s7vE/GC7e6uErxx6w8Ek eVVQqPwtGmQlFtCpL2tcOFGPFihA1W+CjB5XI4Tw383kxqmW6Ur2ucsHxNH5cG3DqCJL AX8w== Received: by 10.204.130.85 with SMTP id r21mr453129bks.53.1336814322458; Sat, 12 May 2012 02:18:42 -0700 (PDT) Received: from localhost (e180217031.adsl.alicedsl.de. [85.180.217.31]) by mx.google.com with ESMTPS id ie3sm22972930bkc.1.2012.05.12.02.18.40 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 12 May 2012 02:18:41 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Sat, 12 May 2012 11:15:22 +0200 Message-Id: <0c9c59178a06f76a4a7154ab118c869892ae0a40.1336811825.git.atar4qemu@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.45 Cc: blauwirbel@gmail.com, Artyom Tarasenko Subject: [Qemu-devel] [PATCH 3/4, master+QEMU 1.1] sun4u: initialize OBIO interrupt mappings 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 Similarly to PCI interrupt mappings, the OBIO ones have to be initialized. Signed-off-by: Artyom Tarasenko --- hw/apb_pci.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/apb_pci.c b/hw/apb_pci.c index 7e28808..d4e11bc 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -404,6 +404,9 @@ static void pci_pbm_reset(DeviceState *d) for (i = 0; i < 8; i++) { s->pci_irq_map[i] &= PBM_PCI_IMR_MASK; } + for (i = 0; i < 32; i++) { + s->obio_irq_map[i] &= PBM_PCI_IMR_MASK; + } if (s->nr_resets++ == 0) { /* Power on reset */ @@ -426,6 +429,9 @@ static int pci_pbm_init_device(SysBusDevice *dev) for (i = 0; i < 8; i++) { s->pci_irq_map[i] = (0x1f << 6) | (i << 2); } + for (i = 0; i < 32; i++) { + s->obio_irq_map[i] = ((0x1f << 6) | 0x20) + i; + } s->pbm_irqs = qemu_allocate_irqs(pci_apb_set_irq, s, MAX_IVEC); /* apb_config */