lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 21 Jan 2015 08:30:17 +0800 From: Yijing Wang <wangyijing@...wei.com> To: Bjorn Helgaas <bhelgaas@...gle.com> CC: Jiang Liu <jiang.liu@...ux.intel.com>, <linux-pci@...r.kernel.org>, Yinghai Lu <yinghai@...nel.org>, <linux-kernel@...r.kernel.org>, Marc Zyngier <marc.zyngier@....com>, <linux-arm-kernel@...ts.infradead.org>, Russell King <linux@....linux.org.uk>, <x86@...nel.org>, Thomas Gleixner <tglx@...utronix.de>, Benjamin Herrenschmidt <benh@...nel.crashing.org>, Rusty Russell <rusty@...tcorp.com.au>, Tony Luck <tony.luck@...el.com>, <linux-ia64@...r.kernel.org>, "David S. Miller" <davem@...emloft.net>, "Guan Xuetao" <gxt@...c.pku.edu.cn>, <linux-alpha@...r.kernel.org>, <linux-m68k@...ts.linux-m68k.org>, Liviu Dudau <liviu@...au.co.uk>, "Arnd Bergmann" <arnd@...db.de>, Geert Uytterhoeven <geert@...ux-m68k.org>, "Yijing Wang" <wangyijing@...wei.com>, Yijing Wang <wangyijing0307@...il.com>, "James E.J. Bottomley" <jejb@...isc-linux.org>, <linux-parisc@...r.kernel.org> Subject: [PATCH v2 22/30] PCI/Parisc: Use pci_scan_root_bus() for simplicity From: Yijing Wang <wangyijing0307@...il.com> Now pci_bus_add_devices() has been ripped out from pci_scan_root_bus(), we could use pci_scan_root_bus() instead of pci_create_root_bus() + pci_scan_child_bus() for simplicity. We could also remove the pci bus resource(dino_current_bus,255) and pci_bus_update_busn_res_end(), because pci_scan_root_bus() would do the same thing. Signed-off-by: Yijing Wang <wangyijing@...wei.com> CC: "James E.J. Bottomley" <jejb@...isc-linux.org> CC: linux-parisc@...r.kernel.org --- drivers/parisc/dino.c | 11 ++--------- drivers/parisc/lba_pci.c | 7 ++----- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index a0580af..e5ee339 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c @@ -977,15 +977,11 @@ static int __init dino_probe(struct parisc_device *dev) if (dino_dev->hba.gmmio_space.flags) pci_add_resource(&resources, &dino_dev->hba.gmmio_space); - dino_dev->hba.bus_num.start = dino_current_bus; - dino_dev->hba.bus_num.end = 255; - dino_dev->hba.bus_num.flags = IORESOURCE_BUS; - pci_add_resource(&resources, &dino_dev->hba.bus_num); /* ** It's not used to avoid chicken/egg problems ** with configuration accessor functions. */ - dino_dev->hba.hba_bus = bus = pci_create_root_bus(&dev->dev, + dino_dev->hba.hba_bus = bus = pci_scan_root_bus(&dev->dev, dino_current_bus, &dino_cfg_ops, NULL, &resources); if (!bus) { printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n", @@ -996,13 +992,10 @@ static int __init dino_probe(struct parisc_device *dev) return 0; } - max = pci_scan_child_bus(bus); - pci_bus_update_busn_res_end(bus, max); - /* This code *depends* on scanning being single threaded * if it isn't, this global bus number count will fail */ - dino_current_bus = max + 1; + dino_current_bus = bus->busn_res.end + 1; pci_bus_assign_resources(bus); pci_bus_add_devices(bus); return 0; diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c index 37e71ff..254bf1a 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c @@ -1423,7 +1423,6 @@ lba_driver_probe(struct parisc_device *dev) void *tmp_obj; char *version; void __iomem *addr = ioremap_nocache(dev->hpa.start, 4096); - int max; /* Read HW Rev First */ func_class = READ_REG32(addr + LBA_FCLASS); @@ -1564,15 +1563,13 @@ lba_driver_probe(struct parisc_device *dev) dev->dev.platform_data = lba_dev; lba_bus = lba_dev->hba.hba_bus = - pci_create_root_bus(&dev->dev, lba_dev->hba.bus_num.start, + pci_scan_root_bus(&dev->dev, lba_dev->hba.bus_num.start, cfg_ops, NULL, &resources); if (!lba_bus) { pci_free_resource_list(&resources); return 0; } - max = pci_scan_child_bus(lba_bus); - /* This is in lieu of calling pci_assign_unassigned_resources() */ if (is_pdc_pat()) { /* assign resources to un-initialized devices */ @@ -1600,7 +1597,7 @@ lba_driver_probe(struct parisc_device *dev) lba_dev->flags |= LBA_FLAG_SKIP_PROBE; } - lba_next_bus = max + 1; + lba_next_bus = pci_bus_child_max_busnr(lba_bus) + 1; pci_bus_add_devices(lba_bus); /* Whew! Finally done! Tell services we got this one covered. */ -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists