From patchwork Sun May 26 15:53:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 2616461 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E0888E0248 for ; Sun, 26 May 2013 15:59:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754642Ab3EZP7i (ORCPT ); Sun, 26 May 2013 11:59:38 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:50062 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754055Ab3EZP7d (ORCPT ); Sun, 26 May 2013 11:59:33 -0400 Received: by mail-pd0-f179.google.com with SMTP id q11so5753326pdj.24 for ; Sun, 26 May 2013 08:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=1xbtp26G8kV3Hnp9C6kO2jXvrZSFBoo3qTqL5E7XC5c=; b=cvHL4VwkkCY2apJjVdJpOENAznYDD3Amf/hSKDKddgsQG01m6kF9SNlvwLBegTBFrT e+cc2bdu5kB/GykXe+uIjLZVwscXVTdrSGlokla4wdJG1B2zcXtMY73PBXJZNGspaJIr zmoLx9iynYfK0dY8rUCn7+J+EfbIJ3EHGfWV5TqBJLfND95kBl3PAg8SSpNmU5cUW3NF 3M0deQ2rOFrO1vWEoZAv2Ozi+SjXXbqph6GOVoU9VZV9PFKmu/l7cQzD+/7EseklA4VH mMXplK+wXRSFuN1Xg+nytJf4i0VhbmKyG5V4ZIqblxe382N5vOnYweRa1trDcAB5TkaF cnIQ== X-Received: by 10.68.232.42 with SMTP id tl10mr25835447pbc.72.1369583973218; Sun, 26 May 2013 08:59:33 -0700 (PDT) Received: from localhost.localdomain ([111.196.197.202]) by mx.google.com with ESMTPSA id ze11sm26603189pab.22.2013.05.26.08.59.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 May 2013 08:59:32 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Yinghai Lu Cc: Jiang Liu , "Rafael J . Wysocki" , Greg Kroah-Hartman , Gu Zheng , Toshi Kani , Myron Stowe , Yijing Wang , Jiang Liu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King , Thierry Reding , Rob Herring , linux-arm-kernel@lists.infradead.org Subject: [PATCH v3, part2 20/20] PCI, ARM: use hotplug-safe PCI bus iterators to walk PCI buses Date: Sun, 26 May 2013 23:53:17 +0800 Message-Id: <1369583597-3801-21-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> References: <1369583597-3801-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Enhance ARM architecture specific code to use new hotplug-safe PCI bus iterators to walk PCI buses. Change pcibios_report_status implementation so that it doesn't access pci_root_buses global list. The pci_root_buses list will be scheduled to be removed. Signed-off-by: Jiang Liu Cc: Russell King Cc: Thierry Reding Cc: Bjorn Helgaas Cc: Greg Kroah-Hartman Cc: Rob Herring Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/kernel/bios32.c | 13 +------------ arch/arm/mach-footbridge/dc21285.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index b2ed73c..50ebbe8 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -22,7 +22,7 @@ static int debug_pci; * We can't use pci_find_device() here since we are * called from interrupt context. */ -static void pcibios_bus_report_status(struct pci_bus *bus, u_int status_mask, int warn) +void pcibios_bus_report_status(struct pci_bus *bus, u_int status_mask, int warn) { struct pci_dev *dev; @@ -55,17 +55,6 @@ static void pcibios_bus_report_status(struct pci_bus *bus, u_int status_mask, in pcibios_bus_report_status(dev->subordinate, status_mask, warn); } -void pcibios_report_status(u_int status_mask, int warn) -{ - struct list_head *l; - - list_for_each(l, &pci_root_buses) { - struct pci_bus *bus = pci_bus_b(l); - - pcibios_bus_report_status(bus, status_mask, warn); - } -} - /* * We don't use this to fix the device, but initialisation of it. * It's not the correct use for this, but it works. diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index a7cd2cf..a0f1d01 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c @@ -35,7 +35,16 @@ PCI_STATUS_PARITY) << 16) extern int setup_arm_irq(int, struct irqaction *); -extern void pcibios_report_status(u_int status_mask, int warn); +extern void pcibios_report_bus_status(struct pci_bus *bus, u_int status_mask, + int warn); + +static struct pci_bus *dc21285_root_bus; + +static void pcibios_report_status(u_int status_mask, int warn) +{ + if (dc21285_root_bus) + pcibios_report_bus_status(dc21285_root_bus, status_mask, warn); +} static unsigned long dc21285_base_address(struct pci_bus *bus, unsigned int devfn) @@ -376,5 +385,6 @@ void __init dc21285_preinit(void) void __init dc21285_postinit(void) { + dc21285_root_bus = pci_get_next_root_bus(NULL); register_isa_ports(DC21285_PCI_MEM, DC21285_PCI_IO, 0); }