From patchwork Tue Aug 5 16:11:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Minter X-Patchwork-Id: 4680381 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 8B8DEC0338 for ; Tue, 5 Aug 2014 16:12:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEBBC2017D for ; Tue, 5 Aug 2014 16:12:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE31E201CE for ; Tue, 5 Aug 2014 16:12:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755083AbaHEQMN (ORCPT ); Tue, 5 Aug 2014 12:12:13 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:52914 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754005AbaHEQMJ (ORCPT ); Tue, 5 Aug 2014 12:12:09 -0400 Received: by mail-wi0-f180.google.com with SMTP id n3so1629063wiv.13 for ; Tue, 05 Aug 2014 09:12:07 -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=KbYPeBBSqovfQoPrn7tRQZSMSNsGRX3eUoKlKTwXuGo=; b=hW98wjxzc5Q643AKjud9hw2qtZPBDiCwp7ZOaKiFBvSaxHnDoHdZ0jF+mAQZKqWhFO Ju3Oy+823GjqKzLHRTTzwuKmyROWzeAgvtlWhmyI2Fi+9QlOwKNl43I1KF6mHE02eUkU S9ZKFcoD07TRcs0L0vAfLRsi73i0sP6zp5aJU= 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=KbYPeBBSqovfQoPrn7tRQZSMSNsGRX3eUoKlKTwXuGo=; b=FVFZ/DglI0zBygduxuJLBiQtvWXKi5rAIlj/QCQT5T5xbSIBz+zf3ul3bpfdcCR7R5 owMfA/3TQ25gk3oadMws95X0ZAtQSMnnn478z94GRKo2wYc2wIogqVxhn5Gi/713U6wa DWKz0DjlyNYjuM/0ItZ6AVhj3KrdRexNqjXf4LcSfc5iBPUmXuLpBFS9LDsRf9Of8EEU rf0mFvhlp4P/p1GR3UzHMsuSHOUOTv60o+aWozKRWgTAaeZ2BhVmZkZsxCYZFC5PuhVZ vr9qO4huw2A5focEqM1YoqjmS2B4Im79zqUzSIDhUdYo1Hyb62o+UGY+vgyNvd7Uo8S8 /tzg== X-Gm-Message-State: ALoCoQkSWE8BkpJG305ZhsWK6hqKl/gH3/FRGtaPmQ70Ulzjy6J//zsapGdKW7dqD4eHF6TCVrRz X-Received: by 10.194.172.137 with SMTP id bc9mr7554982wjc.72.1407255127692; Tue, 05 Aug 2014 09:12:07 -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.07 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 05 Aug 2014 09:12:07 -0700 (PDT) From: matthew_minter@xyratex.com To: bhelgaas@google.com, linux-pci@vger.kernel.org Cc: matthew_minter Subject: [PATCH 14/22] Added (untested) support to alpha architecture to accomodate new irq init code Date: Tue, 5 Aug 2014 17:11:15 +0100 Message-Id: <1407255083-9356-15-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/alpha/kernel/pci.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 076c35c..338537c 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -28,7 +28,7 @@ /* - * Some string constants used by the various core logics. + * Some string constants used by the various core logics. */ const char *const pci_io_names[] = { @@ -247,7 +247,7 @@ void pcibios_fixup_bus(struct pci_bus *bus) if (pci_has_flag(PCI_PROBE_ONLY) && dev && (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) { pci_read_bridge_bases(bus); - } + } list_for_each_entry(dev, &bus->devices, bus_list) { pdev_save_srm_config(dev); @@ -338,7 +338,7 @@ common_init_pci(void) hose->need_domain_info = need_domain_info; next_busno = bus->busn_res.end + 1; /* Don't allow 8-bit bus number overflow inside the hose - - reserve some space for bridges. */ + reserve some space for bridges. */ if (next_busno > 224) { next_busno = 0; need_domain_info = 1; @@ -346,11 +346,15 @@ common_init_pci(void) } pcibios_claim_console_setup(); - pci_assign_unassigned_resources(); - pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq); } +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) +{ + bridge->swizzle_irq = alpha_mv.pci_swizzle; + bridge->map_irq = alpha_mv.pci_map_irq; + return 0; +} struct pci_controller * __init alloc_pci_controller(void) @@ -387,7 +391,7 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn) /* from hose or from bus.devfn */ if (which & IOBASE_FROM_HOSE) { - for(hose = hose_head; hose; hose = hose->next) + for(hose = hose_head; hose; hose = hose->next) if (hose->index == bus) break; if (!hose) return -ENODEV; } else {