From patchwork Sat Apr 27 05:55:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 240079 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 F15BC2C00EB for ; Sat, 27 Apr 2013 15:57:00 +1000 (EST) Received: from localhost ([::1]:44771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVy83-0005UR-9W for incoming@patchwork.ozlabs.org; Sat, 27 Apr 2013 01:56:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVy6Y-0003Kd-PO for qemu-devel@nongnu.org; Sat, 27 Apr 2013 01:55:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVy6X-0008Lt-RD for qemu-devel@nongnu.org; Sat, 27 Apr 2013 01:55:26 -0400 Received: from mail-bk0-x232.google.com ([2a00:1450:4008:c01::232]:45187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVy6X-0008Li-Kz for qemu-devel@nongnu.org; Sat, 27 Apr 2013 01:55:25 -0400 Received: by mail-bk0-f50.google.com with SMTP id ik5so2017446bkc.9 for ; Fri, 26 Apr 2013 22:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=3h1zl3yOd9cu1E3MX73ooyX62nbycxP+jhoFTzrO/HA=; b=OMEJ8vkyf9dDkXpyGsLvTuoPcujD19+XBq0rEaaYOsCbXRdtdhtbUbWlUdhNkyqDqH tJgcysFz4MHtGsgH45qHwglYe6tYihm3UfT7ayrB0w/eftM8uUUdi2PWAbzU/lDHLF5k e3XovM65OEQEu/U1xbTanFVJykyYlWThcZHERmxmCqT4Vc8V9Ka1vHbGOre7A3raVIVw qYABQqvl//QFzWMe0yWbRwBSuKs3biUyUIHKTT7GNx6eG/j98pF7Ij8Z2qDRmnTKBUps wH0Z6VT3XavC191MVbJyu70MDBDNjGLFQoWu5HGkJwUhR1NAx5ynnAhWOVM3NKGfUN4p mduA== X-Received: by 10.205.41.199 with SMTP id tv7mr19063912bkb.97.1367042124674; Fri, 26 Apr 2013 22:55:24 -0700 (PDT) Received: from localhost (e181210163.adsl.alicedsl.de. [85.181.210.163]) by mx.google.com with ESMTPSA id da16sm4041955bkb.2.2013.04.26.22.55.23 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 26 Apr 2013 22:55:24 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Sat, 27 Apr 2013 07:55:13 +0200 Message-Id: <34aa76c8608984ca537823062c0192a4f30218a2.1366987353.git.atar4qemu@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::232 Cc: blauwirbel@gmail.com, Artyom Tarasenko Subject: [Qemu-devel] [PATCH 3/3] sparc64: use direct interrupt mapping for PCI devices 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 Every PCI Slot in PBM has 4 directly mapped IRQ lines. Use the IRQ routing schema 0bssnn (Bus, Slot, interrupt Number) described in Section 19.3.3 of UltraSPARC™-IIi User's Manual. Please note that this patch requires the OpenBIOS counterpart patch. Signed-off-by: Artyom Tarasenko --- hw/pci-host/apb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c index 356853a..93ce46d 100644 --- a/hw/pci-host/apb.c +++ b/hw/pci-host/apb.c @@ -365,7 +365,7 @@ static int pci_pbm_map_irq(PCIDevice *pci_dev, int irq_num) bus_offset = 16; else bus_offset = 0; - return bus_offset + irq_num; + return (bus_offset + (PCI_SLOT(pci_dev->devfn) << 2) + irq_num) & 0x1f; } static void pci_apb_set_irq(void *opaque, int irq_num, int level)