From patchwork Mon Nov 17 10:21:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 40890 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D868F24035 for ; Mon, 17 Nov 2014 09:43:28 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf851030wgg.3 for ; Mon, 17 Nov 2014 01:43:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=ttstEp0RsgMUFu5EHKEtkZb8/HR3NlIgXPSLtK/gaOo=; b=NfI1riiFsaH/btGVJCODL7sOeeqWcYnxtK4fxUWyAaiNj9k3PKeAS4UHJuRmekPyja sxQscCdgG8YbIACedWoCs7S3na4nEzQ1sWntRzseLHrASzPUHNCDzDYFbG42rD0209f2 Si6fc3+uVQpXZWVcJrX2o7fyVTdBd6i3L/WHbDAWLOLkg/bOSEosm+VCZQE3nIntQA3M KZ9TbSnWa+0DAxNGxgSk47IwcKnlDgH1mtGCQo5/10xxqfQoE6hDVceNWx6xCByyliAK vhkyp4jgNN72FM69KRjTLjl7PtVNwZgcJWMM6kUqklK+gQmW2g40UJ7TxI1O5BEOSTwi YVWw== X-Gm-Message-State: ALoCoQmZkaz6ahX1fe75ow213UtLoMc1pmqXF1/qhAiQpA4N0bNQVINqPhfIcVdOiCPHYhzZyWAB X-Received: by 10.112.199.167 with SMTP id jl7mr2203642lbc.5.1416217408121; Mon, 17 Nov 2014 01:43:28 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.51 with SMTP id t19ls736847lal.16.gmail; Mon, 17 Nov 2014 01:43:27 -0800 (PST) X-Received: by 10.152.7.229 with SMTP id m5mr26303580laa.32.1416217407677; Mon, 17 Nov 2014 01:43:27 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id ld12si51031573lac.105.2014.11.17.01.43.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Nov 2014 01:43:27 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id hz20so7855721lab.17 for ; Mon, 17 Nov 2014 01:43:27 -0800 (PST) X-Received: by 10.112.189.10 with SMTP id ge10mr25857608lbc.23.1416217407322; Mon, 17 Nov 2014 01:43:27 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp1127350lbc; Mon, 17 Nov 2014 01:43:26 -0800 (PST) X-Received: by 10.68.93.132 with SMTP id cu4mr28488022pbb.36.1416217405647; Mon, 17 Nov 2014 01:43:25 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ck6si34731806pad.145.2014.11.17.01.43.24 for ; Mon, 17 Nov 2014 01:43:25 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752085AbaKQJkz (ORCPT + 26 others); Mon, 17 Nov 2014 04:40:55 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:43152 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751547AbaKQJkw (ORCPT ); Mon, 17 Nov 2014 04:40:52 -0500 Received: from 172.24.2.119 (EHLO szxeml462-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CEO10146; Mon, 17 Nov 2014 17:40:45 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml462-hub.china.huawei.com (10.82.67.205) with Microsoft SMTP Server id 14.3.158.1; Mon, 17 Nov 2014 17:40:35 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , , Xinwei Hu , Wuyun , , Russell King , , Thomas Gleixner , Benjamin Herrenschmidt , , Tony Luck , , Thierry Reding , Liviu Dudau , , Yijing Wang Subject: [RFC PATCH 10/16] PCI: Add of_scan_bus() to pci_host_info Date: Mon, 17 Nov 2014 18:21:44 +0800 Message-ID: <1416219710-26088-11-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1416219710-26088-1-git-send-email-wangyijing@huawei.com> References: <1416219710-26088-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangyijing@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add of_scan_bus() to support some platforms scan bus by of_node. Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 1 + drivers/pci/probe.c | 10 +++++++--- include/linux/pci.h | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 872cae1..1a1f81b 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -52,6 +52,7 @@ struct pci_host_bridge *pci_create_host_bridge( return NULL; host->sysdata = info->arg; + host->node = info->node; host->busnum = PCI_BUSNUM(db); host->domain = PCI_DOMAIN(db); host->ops = ops; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 42158fd..2729c41 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2126,9 +2126,13 @@ struct pci_host_bridge *pci_scan_host_bridge( pci_bus_insert_busn_res(host->bus, host->busnum, 255); } - max = pci_scan_child_bus(host->bus); - if (!found) - pci_bus_update_busn_res_end(host->bus, max); + if (info->of_scan_bus) { + info->of_scan_bus(host); + } else { + max = pci_scan_child_bus(host->bus); + if (!found) + pci_bus_update_busn_res_end(host->bus, max); + } return host; diff --git a/include/linux/pci.h b/include/linux/pci.h index af1ee86..c4f4438 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -407,6 +407,7 @@ struct pci_host_bridge { int busnum; int domain; void *sysdata; + struct device_node *node; struct pci_ops *ops; struct msi_controller *(*get_msi_ctrl)(struct pci_dev *pdev); void (*release_fn)(struct pci_host_bridge *); @@ -416,10 +417,12 @@ struct pci_host_bridge { struct pci_host_info { u8 res_type; void *arg; + struct device_node *node; struct list_head *resources; /*just for build, will clean up later */ struct msi_controller *(*get_msi_ctrl)(struct pci_dev *pdev); int (*init_res)(struct pci_host_bridge *host, struct pci_host_info *info); + void (*of_scan_bus)(struct pci_host_bridge *host); }; static inline void init_pci_host_info(struct pci_host_info *info)