From patchwork Tue Aug 5 16:11:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Minter X-Patchwork-Id: 4680471 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EB6A99F373 for ; Tue, 5 Aug 2014 16:12:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E44BA2017A for ; Tue, 5 Aug 2014 16:12:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D20592018E for ; Tue, 5 Aug 2014 16:12:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755138AbaHEQMU (ORCPT ); Tue, 5 Aug 2014 12:12:20 -0400 Received: from mail-we0-f171.google.com ([74.125.82.171]:48187 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755021AbaHEQMN (ORCPT ); Tue, 5 Aug 2014 12:12:13 -0400 Received: by mail-we0-f171.google.com with SMTP id p10so1266735wes.30 for ; Tue, 05 Aug 2014 09:12:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=myport.ac.uk; s=google-20130730; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=sdeqK8puxCf1aKvKcFQCe2GnQKqDNUOp9ae5qxhDnvs=; b=CqHuP1fJ71ylDzJgmXCc3TU8B1W+4Da2hB49lnlmKnMPfPKTPSvgMGPoWaFisqnerp StOa78JyENJYLrfRmLNJ/aJJYet0aFyj0FwEjOHQo+urQBnZz7kf/Onowe0M4oXekT7f NJEifLN5pojwFBSNZ/taHYdmvyfZliDiYDufk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=sdeqK8puxCf1aKvKcFQCe2GnQKqDNUOp9ae5qxhDnvs=; b=EQH9xGQoJ4DPU6dFbiM5UUVRjSVr8aAr5ObInMDQsulpgIuYROSemDKAiAgfrn/s+c UiAzMQc4BWMUYlfEv/ezmEPi8qsdg+4RrbT+Vx8Cvk/WfhRCSb4ZEdXXF9Gs4V81x7dd VgyJXKZe+EvDQDZtyFKQ7TB3yNjKkT7a6QYGTXA3yWD3FAOpP8/3WqUiJ+pF4AViRUWN L+VD/dW0DCXp+2Ltla7mEefDexGiWZAyJvHIYq+GG9OcN4mpPx+5iNlzRFbOQfO8a0CN ERdiGZqU8AvaRp3+V8aPqRhfDvLy3MzV69kuqYLJ2P0TMmhD35cNYAgNv8NaCUBDkd6w MJdA== X-Gm-Message-State: ALoCoQmTBt7rx660siJCKtZSnh7FEQb1ODX3qLIZftt/1Vf9E4KwNIV0bECBVV3RH9ehXx2KDMpL X-Received: by 10.194.243.99 with SMTP id wx3mr7509972wjc.58.1407255132050; Tue, 05 Aug 2014 09:12:12 -0700 (PDT) Received: from localhost.xy01.xyratex.com (xyratex195.xyratex.com. [194.131.166.195]) by mx.google.com with ESMTPSA id e3sm5169369wjp.4.2014.08.05.09.12.11 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Aug 2014 09:12:11 -0700 (PDT) From: matthew_minter@xyratex.com To: bhelgaas@google.com, linux-pci@vger.kernel.org Cc: matthew_minter Subject: [PATCH 19/22] Added (untested) workaround to s390 architecture to accomodate new irq init code. Unfortunately adding runtime irq assignment will not work but avoided breaking the existing code Date: Tue, 5 Aug 2014 17:11:20 +0100 Message-Id: <1407255083-9356-20-git-send-email-matthew_minter@xyratex.com> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1407255083-9356-1-git-send-email-matthew_minter@xyratex.com> References: <1407255083-9356-1-git-send-email-matthew_minter@xyratex.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,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 --- 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 9ddc51e..be7d1fe 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -474,6 +474,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);