From patchwork Tue Aug 5 16:11:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Minter X-Patchwork-Id: 4680311 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 862879F373 for ; Tue, 5 Aug 2014 16:12:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4C9F2017A for ; Tue, 5 Aug 2014 16:12:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0BED2017D for ; Tue, 5 Aug 2014 16:12:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755051AbaHEQMH (ORCPT ); Tue, 5 Aug 2014 12:12:07 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:64038 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754957AbaHEQME (ORCPT ); Tue, 5 Aug 2014 12:12:04 -0400 Received: by mail-we0-f169.google.com with SMTP id u56so1281236wes.28 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=A6dW5JzrRHBVTHV0qo+NuasQrWKuJRIxE640IvqkeUk=; b=ChU2VBkRD5qSppMjTHv9rjiGgjes16Jln0oF0+Tc604SxaGUFuVYHwgL7uXE/hirs1 FXKHzyUUhjO6yijfzJ0JGud1HiHKh9RjRiVNhmc9lt6KLw6QRUy8w2YzeQJylsBk7QWx N1rJvJbBzUqD0+yxf3JyTeafElLz3AAEx71xo= 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=A6dW5JzrRHBVTHV0qo+NuasQrWKuJRIxE640IvqkeUk=; b=UhuYTdro/R+iySCqHrUVF/KQiK7f0Uk9rhdMYcgmugMEgEBUJkJmJ2czrGvjhXpj+M 5gyg6orH8/vYTY4DwMl6XXsiSmYCKKhyjwvhbIN5qYkpaD5FmDLgx97do9yi8p8pouB2 0woe6AuEOkpnyrzy3+iZnVHxzy/oqk7+f6jr9ifGYW+Lf75/67SbBGV8LHsokCV5UamZ 6bUpFvgaObWhTqy2cAN1ZDLpjCIukeDaYrqqHwEQTrMfSrHiWgs8N70QssnWWBsju5xK uj0XxkmSZqKpgfcNPx8aJpJ923fNPW1vupdUAYs27i9PyhTonDojYNOS4nknuE9pp3pj dKhw== X-Gm-Message-State: ALoCoQnhwgumTJ2cPKRqrftgXb/eO7pM/SFx0sl0uX7yPDuxTLpf+Q15id7ieQK2fzh0ADG5Pgsw X-Received: by 10.180.37.241 with SMTP id b17mr41400524wik.70.1407255123608; Tue, 05 Aug 2014 09:12:03 -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:03 -0700 (PDT) From: matthew_minter@xyratex.com To: bhelgaas@google.com, linux-pci@vger.kernel.org Cc: matthew_minter Subject: [PATCH 09/22] Added (untested) support to microblaze architecture to accomodate new irq init code Date: Tue, 5 Aug 2014 17:11:10 +0100 Message-Id: <1407255083-9356-10-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/microblaze/pci/pci-common.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 9037914..6843b34 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -850,12 +850,16 @@ void pcibios_setup_bus_devices(struct pci_bus *bus) * code and is needed by the DMA init */ set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); - - /* Read default IRQs and fixup if necessary */ - dev->irq = of_irq_parse_and_map_pci(dev, 0, 0); } } +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + bridge->swizzle_irq = NULL; + bridge->map_irq = of_irq_parse_and_map_pci; + return 0; +} + void pcibios_fixup_bus(struct pci_bus *bus) { /* When called from the generic PCI probe, read PCI<->PCI bridge