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: Mon, 9 Mar 2015 10:34:08 +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>, Bjorn Helgaas <bhelgaas@...gle.com> Subject: [PATCH v6 11/30] PCI: Save sysdata in pci_host_bridge drvdata Save platform specific sysdata in pci_host_bridge drvdata, host bridge specific operation need to access it before the pci bus creation. Signed-off-by: Yijing Wang <wangyijing@...wei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.com> --- drivers/pci/host-bridge.c | 4 +++- drivers/pci/pci.h | 4 +++- drivers/pci/probe.c | 18 ++++++++---------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 0bb08ef..3c34c49 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -23,7 +23,8 @@ static void pci_release_host_bridge_dev(struct device *dev) } struct pci_host_bridge *pci_create_host_bridge( - struct device *parent, u32 db, struct list_head *resources) + struct device *parent, u32 db, + struct list_head *resources, void *sysdata) { int error; int bus = PCI_BUSNUM(db); @@ -58,6 +59,7 @@ struct pci_host_bridge *pci_create_host_bridge( host->dev.parent = parent; INIT_LIST_HEAD(&host->windows); host->dev.release = pci_release_host_bridge_dev; + dev_set_drvdata(&host->dev, sysdata); dev_set_name(&host->dev, "pci%04x:%02x", host->domain, host->busnum); diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 3de5e51..79a8894 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -324,6 +324,8 @@ static inline int pci_dev_specific_reset(struct pci_dev *dev, int probe) #endif struct pci_host_bridge *pci_create_host_bridge( - struct device *parent, u32 dombus, struct list_head *resources); + struct device *parent, u32 dombus, + struct list_head *resources, void *sysdata); + void pci_free_host_bridge(struct pci_host_bridge *host); #endif /* DRIVERS_PCI_H */ diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 7238fa3..c8e074d 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1866,8 +1866,7 @@ void __weak pcibios_remove_bus(struct pci_bus *bus) } static struct pci_bus *__pci_create_root_bus( - struct pci_host_bridge *bridge, struct pci_ops *ops, - void *sysdata) + struct pci_host_bridge *bridge, struct pci_ops *ops) { int error; struct pci_bus *b; @@ -1883,7 +1882,7 @@ static struct pci_bus *__pci_create_root_bus( if (!b) return NULL; - b->sysdata = sysdata; + b->sysdata = dev_get_drvdata(&bridge->dev); b->ops = ops; b->number = b->busn_res.start = bridge->busnum; pci_bus_assign_domain_nr(b, parent); @@ -1955,11 +1954,11 @@ struct pci_bus *pci_create_root_bus(struct device *parent, u32 db, { struct pci_host_bridge *host; - host = pci_create_host_bridge(parent, db, resources); + host = pci_create_host_bridge(parent, db, resources, sysdata); if (!host) return NULL; - return __pci_create_root_bus(host, ops, sysdata); + return __pci_create_root_bus(host, ops); } int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max) @@ -2026,8 +2025,7 @@ void pci_bus_release_busn_res(struct pci_bus *b) } static struct pci_bus *__pci_scan_root_bus( - struct pci_host_bridge *host, struct pci_ops *ops, - void *sysdata) + struct pci_host_bridge *host, struct pci_ops *ops) { struct resource_entry *window; bool found = false; @@ -2040,7 +2038,7 @@ static struct pci_bus *__pci_scan_root_bus( break; } - b = __pci_create_root_bus(host, ops, sysdata); + b = __pci_create_root_bus(host, ops); if (!b) { pci_free_host_bridge(host); return NULL; @@ -2066,11 +2064,11 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, u32 db, { struct pci_host_bridge *host; - host = pci_create_host_bridge(parent, db, resources); + host = pci_create_host_bridge(parent, db, resources, sysdata); if (!host) return NULL; - return __pci_scan_root_bus(host, ops, sysdata); + return __pci_scan_root_bus(host, ops); } EXPORT_SYMBOL(pci_scan_root_bus); -- 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