From patchwork Tue Aug 5 16:11:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Minter X-Patchwork-Id: 4680341 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 3167B9F373 for ; Tue, 5 Aug 2014 16:12:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 697D52017D for ; Tue, 5 Aug 2014 16:12:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95CFB201BA for ; Tue, 5 Aug 2014 16:12:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755115AbaHEQMK (ORCPT ); Tue, 5 Aug 2014 12:12:10 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:33836 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754804AbaHEQME (ORCPT ); Tue, 5 Aug 2014 12:12:04 -0400 Received: by mail-wg0-f43.google.com with SMTP id l18so1205596wgh.2 for ; Tue, 05 Aug 2014 09:12:02 -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=OydtczgPssvTQOf4RK4rhyvjPpNQAsJvMTe7vs1OZE4=; b=QkqlLZN2y3+bQsHxB3wtXHFLwzjLUMIWgqAjuRk0GBRaZV+20tK7pFdd2Hv4e2PC+s wCk8Q/4AwMibeoUTMW6xU0eDAVCErEMFobv2gFfxBybaXaLwwW5x/JSs3I9gpQVwnwKh ZBlaQQ3ILdpe2xiyhRUXZrILoebOH1LE6q6Z0= 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=OydtczgPssvTQOf4RK4rhyvjPpNQAsJvMTe7vs1OZE4=; b=g3imLpzzNcmiKO5N64o+enDNVG5o1ZkG0s3o2QFa0zWF5Q1ZIkTT2tNPY1zZHyIWMc LErP0qFZEruoZ4IJuDh5Qssm5cMdjKvKMYpVKdxkRzUFq+cE5nR7UVw6bYGPqnglBVLY gJG1MUk4Li5Ht8RlxC9Vq6u6kO2zGGyDqZAcFp5+JIuAmAzIeNcbwG6r3wH92LkvCche gC4ltwlVQtvAZVCHoHSmV3TCIWZ5RMNtzsfM10ejIeBKW86RNtHZNL4cLwQmVJsnEXw+ QNNfZPdBLk3iSC3mMWOyVJZgBwK7RBLiuuDTnaE+aX8WD04W1rb2Cl9JvpBchbMvZltp yFaQ== X-Gm-Message-State: ALoCoQkw/cItcnDskhDsQ22nNTq/hzrh2Wdxol7r8p3tr5ytM1XGwzxzKLmwGfWoh1vPAsPVYapm X-Received: by 10.194.90.4 with SMTP id bs4mr7381488wjb.71.1407255121355; Tue, 05 Aug 2014 09:12:01 -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.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Aug 2014 09:12:00 -0700 (PDT) From: matthew_minter@xyratex.com To: bhelgaas@google.com, linux-pci@vger.kernel.org Cc: matthew_minter Subject: [PATCH 06/22] Added (untested) support to mips architecture to accomodate new irq init code Date: Tue, 5 Aug 2014 17:11:07 +0100 Message-Id: <1407255083-9356-7-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/mips/pci/pci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 1bf60b1..dc660a0 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -242,13 +242,18 @@ static int __init pcibios_init(void) for (hose = hose_head; hose; hose = hose->next) pcibios_scanbus(hose); - pci_fixup_irqs(pci_common_swizzle, pcibios_map_irq); - pci_initialized = 1; return 0; } +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + bridge->swizzle_irq = pci_common_swizzle; + bridge->map_irq = pcibios_map_irq; + return 0; +} + subsys_initcall(pcibios_init); static int pcibios_enable_resources(struct pci_dev *dev, int mask)