From patchwork Thu Oct 2 03:50:33 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: 395771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 925111401AD for ; Thu, 2 Oct 2014 14:01:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750842AbaJBEBL (ORCPT ); Thu, 2 Oct 2014 00:01:11 -0400 Received: from foo.masarand.uk ([69.164.217.139]:56324 "EHLO foo.masarand.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751439AbaJBD7Y (ORCPT ); Wed, 1 Oct 2014 23:59:24 -0400 Received: from shredder.masarand.uk (shredder.masarand.uk [81.187.126.108]) by foo.masarand.uk (Postfix) with ESMTPSA id 10C79A183; Thu, 2 Oct 2014 04:51:08 +0100 (BST) From: matt@masarand.com To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, Vality Subject: [PATCH 14/18] Delayed tile setup of PCI IRQs to bus scan time Date: Thu, 2 Oct 2014 04:50:33 +0100 Message-Id: <1412221837-17452-15-git-send-email-matt@masarand.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1412221837-17452-1-git-send-email-matt@masarand.com> References: <1412221837-17452-1-git-send-email-matt@masarand.com> Signed-off-by: Matthew Minter Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Vality Currently pcibios_init is running pci_fixup_irqs in order to assign IRQs to PCI devices, this is only done once at boot-time and causes devices hot-plugged after boot time to not be allocated an IRQ. This is fixed in this patch-set by delaying the allocation untill device enable time by registering the function to be called later. --- arch/tile/kernel/pci.c | 10 +++++++--- arch/tile/kernel/pci_gx.c | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index 1f80a88..6dc0bd8 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -313,9 +313,6 @@ int __init pcibios_init(void) } } - /* Do machine dependent PCI interrupt routing */ - pci_fixup_irqs(pci_common_swizzle, tile_map_irq); - /* * This comes from the generic Linux PCI driver. * @@ -367,6 +364,13 @@ int __init pcibios_init(void) } subsys_initcall(pcibios_init); +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + bridge->swizzle_irq = pci_common_swizzle; + bridge->map_irq = tile_map_irq; + return 0; +} + /* * No bus fixups needed. */ diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index e39f9c5..7d1b5bf 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c @@ -893,9 +893,6 @@ int __init pcibios_init(void) next_busno = bus->busn_res.end + 1; } - /* Do machine dependent PCI interrupt routing */ - pci_fixup_irqs(pci_common_swizzle, tile_map_irq); - /* * This comes from the generic Linux PCI driver. * @@ -1048,6 +1045,13 @@ alloc_mem_map_failed: } subsys_initcall(pcibios_init); +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + bridge->swizzle_irq = pci_common_swizzle; + bridge->map_irq = tile_map_irq; + return 0; +} + /* No bus fixups needed. */ void pcibios_fixup_bus(struct pci_bus *bus) {