From patchwork Thu Oct 2 04:07:46 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: 395786 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 974001401AD for ; Thu, 2 Oct 2014 14:08:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752430AbaJBEIM (ORCPT ); Thu, 2 Oct 2014 00:08:12 -0400 Received: from foo.masarand.uk ([69.164.217.139]:56371 "EHLO foo.masarand.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752409AbaJBEIK (ORCPT ); Thu, 2 Oct 2014 00:08:10 -0400 Received: from shredder.masarand.uk (shredder.masarand.uk [81.187.126.108]) by foo.masarand.uk (Postfix) with ESMTPSA id 8EA36A110; Thu, 2 Oct 2014 05:08:09 +0100 (BST) From: matt@masarand.com To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, Matthew Minter Subject: [PATCH 18/18] Disabled bus scan time PCI IRQ assignment on s390 Date: Thu, 2 Oct 2014 05:07:46 +0100 Message-Id: <1412222866-21068-19-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 From: Matthew Minter Most of the architectures are switched to allocating IRQs at device_enable time instead of boot time, however s390 does not provide an easy way of making that transition so the new code is disabled here on s390. Signed-off-by: Matthew Minter --- arch/s390/pci/pci.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 2fa7b14..720592f 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -434,6 +434,13 @@ out: return rc; } +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + bridge->swizzle_irq = NULL; + bridge->map_irq = NULL; + return 0; +} + void arch_teardown_msi_irqs(struct pci_dev *pdev) { struct zpci_dev *zdev = get_zdev(pdev);