From patchwork Thu Oct 2 04:07:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: matt@masarand.com X-Patchwork-Id: 5016091 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CBC43BEEA6 for ; Thu, 2 Oct 2014 04:08:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9AC9201CE for ; Thu, 2 Oct 2014 04:08:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20D4B20259 for ; Thu, 2 Oct 2014 04:08:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752416AbaJBEIK (ORCPT ); Thu, 2 Oct 2014 00:08:10 -0400 Received: from foo.masarand.uk ([69.164.217.139]:56361 "EHLO foo.masarand.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752395AbaJBEIH (ORCPT ); Thu, 2 Oct 2014 00:08:07 -0400 Received: from shredder.masarand.uk (shredder.masarand.uk [81.187.126.108]) by foo.masarand.uk (Postfix) with ESMTPSA id 3198CA111; Thu, 2 Oct 2014 05:08:06 +0100 (BST) From: matt@masarand.com To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, Matthew Minter Subject: [PATCH 13/18] Delayed sparc setup of PCI IRQs to bus scan time Date: Thu, 2 Oct 2014 05:07:41 +0100 Message-Id: <1412222866-21068-14-git-send-email-matt@masarand.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1412222866-21068-1-git-send-email-matt@masarand.com> References: <1412222866-21068-1-git-send-email-matt@masarand.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Minter Currently sparc allocates PCI IRQs through several different methods based on device. This is done during the boot stage and faces a draw-back by which hot-plugged devices will not be allocated an IRQ, this is fixed by registering IRQ allocation functions for later use during the device enable path. Signed-off-by: Matthew Minter --- arch/sparc/kernel/leon_pci.c | 12 +++++++++++- arch/sparc/kernel/pci.c | 21 +++++++++++++++++---- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c index 899b720..1079eb7 100644 --- a/arch/sparc/kernel/leon_pci.c +++ b/arch/sparc/kernel/leon_pci.c @@ -13,6 +13,8 @@ #include #include +int (*leon_pci_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin); + /* The LEON architecture does not rely on a BIOS or bootloader to setup * PCI for us. The Linux generic routines are used to setup resources, * reset values of configuration-space register settings are preserved. @@ -36,7 +38,7 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info) &resources); if (root_bus) { /* Setup IRQs of all devices using custom routines */ - pci_fixup_irqs(pci_common_swizzle, info->map_irq); + leon_pci_map_irq = info->map_irq; /* Assign devices with resources */ pci_assign_unassigned_resources(); @@ -45,6 +47,14 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info) } } +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + bridge->swizzle_irq = pci_common_swizzle; + bridge->map_irq = leon_pci_map_irq; + return 0; +} + + void pcibios_fixup_bus(struct pci_bus *pbus) { struct pci_dev *dev; diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index b36365f..7361c52 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -340,10 +340,6 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, } else { dev->hdr_type = PCI_HEADER_TYPE_NORMAL; dev->rom_base_reg = PCI_ROM_ADDRESS; - - dev->irq = sd->op->archdata.irqs[0]; - if (dev->irq == 0xffffffff) - dev->irq = PCI_IRQ_NONE; } pci_parse_of_addrs(sd->op, node, dev); @@ -356,6 +352,23 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, return dev; } +int pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +{ + int irq; + struct platform_device *op = of_find_device_by_node(dev->sysdata); + irq = op->archdata.irqs[0]; + if (irq == 0xffffffff) + irq = PCI_IRQ_NONE; + return irq; +} + +int __weak pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + bridge->swizzle_irq = NULL; + bridge->map_irq = pci_map_irq; + return 0; +} + static void apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p) { u32 idx, first, last;