From patchwork Tue Aug 5 16:11:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Minter X-Patchwork-Id: 4680301 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 AE4ACC0338 for ; Tue, 5 Aug 2014 16:12:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6B222017A for ; Tue, 5 Aug 2014 16:12:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 25745201BA for ; Tue, 5 Aug 2014 16:12:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755012AbaHEQMG (ORCPT ); Tue, 5 Aug 2014 12:12:06 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:65326 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754884AbaHEQME (ORCPT ); Tue, 5 Aug 2014 12:12:04 -0400 Received: by mail-wi0-f181.google.com with SMTP id bs8so1616421wib.8 for ; Tue, 05 Aug 2014 09:12:03 -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=6Us/dq0DhPPHLbbQblMM3oYzxK4ykfrL7AjEbIVUXes=; b=B0En7e9IyRaAaC72Y1hnGZYmg+fGev62oZGonAGPWiDHKLSAquuMyc7Ubh2zwyn8aC PuHmL2zC+4wPwj7TlIwhReg9Z5kZejOh5dk8Gg/tH47IXSRn3KHSY3MPAs4crWhgFAZr 4uoSGJLVVpa+qjGA+hDh4c5RmF09kFCbbSiCQ= 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=6Us/dq0DhPPHLbbQblMM3oYzxK4ykfrL7AjEbIVUXes=; b=McWYYQv0BMWXGWzBLA1xe9hMRfuFXIPOSvP4mxwI7uy0ePUwb6VrBYqhZ9/pR17jQ/ 17/7IBUrqgLK0JtOdrUriD8N5b+4ElWucdu2U1xEaeUILiAzpXno1yn0dojUZ1GxuL4V tRxmorEvZnJUqotVZKaTDQw4UQ/EZPbcouAo1u46hbt/XeLzhv2uFjhdfIyEohrAOhvm KSh/MCoNxqtvC6aw3l5YpK2liRhVver69qp2sIFwMm7cHWOZ0msKlJBFXmcfsglbd+I5 MsLn2kz+DnXFGuEoUn90Q4MRFv646xPjHb9o363BQQPWFgm3Evvup1MTZLAUynwk0Z5+ CZlw== X-Gm-Message-State: ALoCoQlPgMf+lzafDo4k9DG7Dj7vO1U1sEdKzdZzd1elKmjEIYgYdbJ70pwhIJrSE9Eubfxaizj+ X-Received: by 10.180.183.36 with SMTP id ej4mr7846348wic.77.1407255122891; Tue, 05 Aug 2014 09:12:02 -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.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Aug 2014 09:12:02 -0700 (PDT) From: matthew_minter@xyratex.com To: bhelgaas@google.com, linux-pci@vger.kernel.org Cc: matthew_minter Subject: [PATCH 08/22] Added (untested) workaround to ia64 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:09 +0100 Message-Id: <1407255083-9356-9-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/ia64/pci/pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 291a582..398d5d4 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -483,6 +483,9 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { struct pci_controller *controller = bridge->bus->sysdata; + bridge->swizzle_irq = NULL; + bridge->map_irq = NULL; + ACPI_COMPANION_SET(&bridge->dev, controller->companion); return 0; }