From patchwork Fri Mar 13 02:36:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6001261 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 99A37BF90F for ; Fri, 13 Mar 2015 02:37:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF1F9202E5 for ; Fri, 13 Mar 2015 02:37:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97D47202D1 for ; Fri, 13 Mar 2015 02:37:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755117AbbCMChL (ORCPT ); Thu, 12 Mar 2015 22:37:11 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:60731 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752632AbbCMChH (ORCPT ); Thu, 12 Mar 2015 22:37:07 -0400 Received: from 172.24.2.119 (EHLO szxeml432-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BDA73686; Fri, 13 Mar 2015 10:36:47 +0800 (CST) Received: from [127.0.0.1] (10.177.27.212) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.158.1; Fri, 13 Mar 2015 10:36:41 +0800 Message-ID: <55024D35.6050509@huawei.com> Date: Fri, 13 Mar 2015 10:36:37 +0800 From: Yijing Wang User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Bjorn Helgaas CC: Jiang Liu , , Yinghai Lu , , Marc Zyngier , , Russell King , , Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , , "David S. Miller" , "Guan Xuetao" , , , Liviu Dudau , "Arnd Bergmann" , Geert Uytterhoeven , "Konrad Rzeszutek Wilk" , Subject: Re: [PATCH v6 04/30] xen/PCI: Don't use deprecated function pci_scan_bus_parented() References: <1425868467-9667-1-git-send-email-wangyijing@huawei.com> <1425868467-9667-5-git-send-email-wangyijing@huawei.com> <20150311223211.GB1082@google.com> <55017CA5.2010502@huawei.com> <20150312193505.GB7346@google.com> In-Reply-To: <20150312193505.GB7346@google.com> X-Originating-IP: [10.177.27.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A0C0201.55024D41.00D4, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 119937550651d4b75910862498a885d7 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 >>>> + pci_add_resource(&resources, &ioport_resource); >>>> + pci_add_resource(&resources, &iomem_resource); >>>> + pci_add_resource(&resources, &busn_resource); >>> >>> Since I don't want to export busn_resource, you might have to allocate your >>> own struct resource for it here. And, of course, figure out the details of >>> which PCI domain you're in and whether you need to share one struct >>> resource across several host bridges in the same domain. >> >> Allocate its own resource here is ok for me, as I mentioned in previous reply, >> so do we still need to add additional info to figure out which domain own the bus resource ? > > That's up to the caller. Only the platform knows which bridges it wants to > have in the same domain. In principle, every host bridge could be in its > own domain, since each bridge is the root of a unique PCI hierarchy. But > some platforms have firmware that assumes otherwise. I have no idea what > xen assumes. I'm not xen guy, so I don't know much about it, but because it call pci_scan_bus_parented() before, and in which busn_resource is always shared for different host bridges(same domain or not), I think add a static bus resource(0,255) should be safe, at least, it would not introduce new risk. Something like: >>>> pcifront_init_sd(sd, domain, bus, pdev); >>>> >>>> pci_lock_rescan_remove(); >>>> >>>> - b = pci_scan_bus_parented(&pdev->xdev->dev, bus, >>>> - &pcifront_bus_ops, sd); >>>> + b = pci_scan_root_bus(&pdev->xdev->dev, bus, >>>> + &pcifront_bus_ops, sd, &resources); >>>> if (!b) { >>>> dev_err(&pdev->xdev->dev, >>>> "Error creating PCI Frontend Bus!\n"); >>>> err = -ENOMEM; >>>> pci_unlock_rescan_remove(); >>>> + pci_free_resource_list(&resources); >>>> goto err_out; >>>> } >>>> >>>> @@ -488,7 +494,7 @@ static int pcifront_scan_root(struct pcifront_device *pdev, >>>> >>>> list_add(&bus_entry->list, &pdev->root_buses); >>>> >>>> - /* pci_scan_bus_parented skips devices which do not have a have >>>> + /* pci_scan_root_bus skips devices which do not have a >>>> * devfn==0. The pcifront_scan_bus enumerates all devfn. */ >>>> err = pcifront_scan_bus(pdev, domain, bus, b); >>>> >>>> -- >>>> 1.7.1 >>>> >>>> -- >>>> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >>>> the body of a message to majordomo@vger.kernel.org >>>> More majordomo info at http://vger.kernel.org/majordomo-info.html >>> >>> . >>> >> >> >> -- >> Thanks! >> Yijing >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-pci" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > . > diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index b1ffebe..a69e529 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c @@ -446,9 +446,15 @@ static int pcifront_scan_root(struct pcifront_device *pdev, unsigned int domain, unsigned int bus) { struct pci_bus *b; + LIST_HEAD(resources); struct pcifront_sd *sd = NULL; struct pci_bus_entry *bus_entry = NULL; int err = 0; + static struct resource busn_res = { + .start = 0, + .end = 255, + .flags = IORESOURCE_BUS, + }; #ifndef CONFIG_PCI_DOMAINS if (domain != 0) { @@ -470,17 +476,21 @@ static int pcifront_scan_root(struct pcifront_device *pdev, err = -ENOMEM; goto err_out; } + pci_add_resource(&resources, &ioport_resource); + pci_add_resource(&resources, &iomem_resource); + pci_add_resource(&resources, &busn_res); pcifront_init_sd(sd, domain, bus, pdev); pci_lock_rescan_remove(); - b = pci_scan_bus_parented(&pdev->xdev->dev, bus, - &pcifront_bus_ops, sd); + b = pci_scan_root_bus(&pdev->xdev->dev, bus, + &pcifront_bus_ops, sd, &resources); if (!b) { Bjorn, what do you think about ? Thanks! Yijing. >