From: wangyijing@huawei.com (Yijing Wang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 11/30] PCI: Save sysdata in pci_host_bridge drvdata
Date: Mon, 9 Mar 2015 10:34:08 +0800 [thread overview]
Message-ID: <1425868467-9667-12-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1425868467-9667-1-git-send-email-wangyijing@huawei.com>
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@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.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
next prev parent reply other threads:[~2015-03-09 2:34 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-09 2:33 [PATCH v6 00/30] Refine PCI scan interfaces and make generic pci host bridge Yijing Wang
2015-03-09 2:33 ` [PATCH v6 01/30] PCI: Rip out pci_bus_add_devices() from pci_scan_bus() Yijing Wang
2015-03-09 2:33 ` [PATCH v6 02/30] PCI: Rip out pci_bus_add_devices() from pci_scan_root_bus() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 03/30] PCI: Export busn_resource to drivers/pci Yijing Wang
2015-03-11 22:28 ` Bjorn Helgaas
2015-03-12 11:42 ` Yijing Wang
2015-03-12 19:32 ` Bjorn Helgaas
2015-03-13 1:57 ` Yijing Wang
2015-03-09 2:34 ` [PATCH v6 04/30] xen/PCI: Don't use deprecated function pci_scan_bus_parented() Yijing Wang
2015-03-11 22:32 ` Bjorn Helgaas
2015-03-12 11:46 ` Yijing Wang
2015-03-12 19:35 ` Bjorn Helgaas
2015-03-13 2:36 ` Yijing Wang
2015-03-13 13:24 ` Bjorn Helgaas
2015-03-13 14:01 ` Konrad Rzeszutek Wilk
2015-03-13 14:26 ` Bjorn Helgaas
2015-03-25 19:23 ` Konrad Rzeszutek Wilk
2015-03-26 1:18 ` Yijing Wang
2015-03-26 7:30 ` Yijing Wang
2015-03-09 2:34 ` [PATCH v6 05/30] PCI: Remove deprecated pci_scan_bus_parented() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 06/30] PCI: Combine PCI domain and bus number in u32 arg Yijing Wang
2015-03-12 1:29 ` Bjorn Helgaas
2015-03-12 12:14 ` Yijing Wang
2015-03-12 19:49 ` Bjorn Helgaas
2015-03-13 3:19 ` Yijing Wang
2015-03-09 2:34 ` [PATCH v6 07/30] PCI: Pass PCI domain number combined with root bus number Yijing Wang
2015-03-12 1:34 ` Bjorn Helgaas
2015-03-12 12:20 ` Yijing Wang
2015-03-17 5:15 ` [Xen-devel] " Manish Jaggi
2015-03-17 14:05 ` Ian Campbell
2015-03-09 2:34 ` [PATCH v6 08/30] PCI: Introduce pci_host_assign_domain_nr() to assign domain Yijing Wang
2015-03-12 1:39 ` Bjorn Helgaas
2015-03-12 12:23 ` Yijing Wang
2015-03-09 2:34 ` [PATCH v6 09/30] PCI: Separate pci_host_bridge creation out of pci_create_root_bus() Yijing Wang
2015-03-12 3:52 ` Bjorn Helgaas
2015-03-12 13:44 ` Yijing Wang
2015-03-21 23:21 ` Suravee Suthikulpanit
2015-03-23 1:08 ` Yijing Wang
2015-03-09 2:34 ` [PATCH v6 10/30] PCI: Introduce pci_host_bridge_list to manage host bridges Yijing Wang
2015-03-12 2:55 ` Bjorn Helgaas
2015-03-12 13:03 ` Yijing Wang
2015-03-12 19:56 ` Bjorn Helgaas
2015-03-13 3:28 ` Yijing Wang
2015-03-13 14:33 ` Bjorn Helgaas
2015-03-16 1:28 ` Yijing Wang
2015-03-09 2:34 ` Yijing Wang [this message]
2015-03-09 2:34 ` [PATCH v6 12/30] PCI: Introduce pci_host_bridge_ops to support host specific operations Yijing Wang
2015-03-12 3:23 ` Bjorn Helgaas
2015-03-12 13:14 ` Yijing Wang
2015-03-09 2:34 ` [PATCH v6 13/30] PCI: Introduce new scan function pci_scan_host_bridge() Yijing Wang
2015-03-12 3:25 ` Bjorn Helgaas
2015-03-12 13:15 ` Yijing Wang
2015-03-09 2:34 ` [PATCH v6 14/30] x86/PCI: Refine pci_acpi_scan_root() with generic pci_host_bridge Yijing Wang
2015-03-09 2:34 ` [PATCH v6 15/30] ia64/PCI: " Yijing Wang
2015-03-09 2:34 ` [PATCH v6 16/30] powerpc/pci: Rename pcibios_root_bridge_prepare() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 17/30] powerpc/pci: Use pci_scan_host_bridge() for simplicity Yijing Wang
2015-03-09 2:34 ` [PATCH v6 18/30] PCI: Remove weak pcibios_root_bridge_prepare() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 19/30] sparc/PCI: Claim bus resources before pci_bus_add_devices() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 20/30] sparc/PCI: Use pci_scan_host_bridge() for simplicity Yijing Wang
2015-03-12 3:30 ` Bjorn Helgaas
2015-03-12 13:17 ` Yijing Wang
2015-03-09 2:34 ` [PATCH v6 21/30] PCI: Introduce pci_bus_child_max_busnr() Yijing Wang
2015-03-12 3:33 ` Bjorn Helgaas
2015-03-12 13:24 ` Yijing Wang
2015-03-12 3:36 ` Bjorn Helgaas
2015-03-12 13:28 ` Yijing Wang
2015-03-12 20:00 ` Bjorn Helgaas
2015-03-09 2:34 ` [PATCH v6 22/30] parisc/PCI: Use pci_scan_root_bus() for simplicity Yijing Wang
2015-03-09 2:34 ` [PATCH v6 23/30] PCI/mvebu: Use pci_common_init_dev() to simplify code Yijing Wang
2015-03-09 2:34 ` [PATCH v6 24/30] PCI/tegra: Remove redundant tegra_pcie_scan_bus() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 25/30] PCI/designware: Use pci_scan_root_bus() for simplicity Yijing Wang
2015-03-09 2:34 ` [PATCH v6 26/30] PCI/xgene: Use pci_scan_root_bus() instead of pci_create_root_bus() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 27/30] PCI: Rename __pci_create_root_bus() to pci_create_root_bus() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 28/30] PCI: Export find_pci_host_bridge() and rename to pci_find_host_bridge() Yijing Wang
2015-03-12 3:43 ` Bjorn Helgaas
2015-03-12 13:29 ` Yijing Wang
2015-03-09 2:34 ` [PATCH v6 29/30] PCI: Remove platform specific pci_domain_nr() Yijing Wang
2015-03-09 2:34 ` [PATCH v6 30/30] PCI: Remove pci_bus_assign_domain_nr() Yijing Wang
2015-03-12 3:48 ` Bjorn Helgaas
2015-03-12 13:32 ` Yijing Wang
2015-03-12 21:23 ` [PATCH v6 00/30] Refine PCI scan interfaces and make generic pci host bridge Bjorn Helgaas
2015-03-13 3:29 ` Yijing Wang
2015-03-13 11:31 ` Liviu Dudau
2015-03-13 14:48 ` Bjorn Helgaas
2015-03-16 1:31 ` Yijing Wang
2015-03-16 1:48 ` Yijing Wang
2015-03-17 10:55 ` Liviu Dudau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425868467-9667-12-git-send-email-wangyijing@huawei.com \
--to=wangyijing@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).