From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Russell King <linux@arm.linux.org.uk>, <dja@axtens.net>,
<linux-xtensa@linux-xtensa.org>, <x86@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>, <linux-mips@linux-mips.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Rusty Russell <rusty@rustcorp.com.au>,
<linuxppc-dev@lists.ozlabs.org>, <linux-s390@vger.kernel.org>,
Tony Luck <tony.luck@intel.com>, <linux-ia64@vger.kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Guan Xuetao <gxt@mprc.pku.edu.cn>, <linux-alpha@vger.kernel.org>,
<linux-m68k@lists.linux-m68k.org>, <linux-am33-list@redhat.com>,
Liviu Dudau <liviu@dudau.co.uk>, Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Yijing Wang <wangyijing@huawei.com>
Subject: [PATCH part3 v12 06/10] PCI: Make pci_host_bridge hold sysdata in drvdata
Date: Mon, 20 Jul 2015 20:01:14 +0800 [thread overview]
Message-ID: <1437393678-4077-7-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1437393678-4077-1-git-send-email-wangyijing@huawei.com>
Now platform specific sysdata is saved in pci_bus,
and pcibios_root_bridge_prepare() need to know
the sysdata. Later, we would move pcibios_root_bridge_prepare()
prior to root bus creation, so we need to make
pci_host_bridge hold sysdata.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
arch/ia64/pci/pci.c | 2 +-
arch/x86/pci/acpi.c | 2 +-
drivers/pci/probe.c | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 67ffe1f..8f79852 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -485,7 +485,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
* that case.
*/
if (!bridge->dev.parent) {
- struct pci_controller *controller = bridge->bus->sysdata;
+ struct pci_controller *controller = dev_get_drvdata(&bridge->dev);
ACPI_COMPANION_SET(&bridge->dev, controller->companion);
}
return 0;
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 629fc3b..38ce348 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -502,7 +502,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
* that case.
*/
if (!bridge->dev.parent) {
- struct pci_sysdata *sd = bridge->bus->sysdata;
+ struct pci_sysdata *sd = dev_get_drvdata(&bridge->dev);
ACPI_COMPANION_SET(&bridge->dev, sd->companion);
}
return 0;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 0eba126..0ae8bf2 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1967,6 +1967,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain,
bridge->domain = domain;
bridge->dev.parent = parent;
bridge->dev.release = pci_release_host_bridge_dev;
+ dev_set_drvdata(&bridge->dev, sysdata);
dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus);
error = pcibios_root_bridge_prepare(bridge);
if (error) {
--
1.7.1
next prev parent reply other threads:[~2015-07-20 12:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-20 12:01 [PATCH part3 v12 00/10] Cleanup platform pci_domain_nr() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 01/10] PCI: Save domain in pci_host_bridge Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 02/10] PCI: Move pci_bus_assign_domain_nr() declaration into drivers/pci/pci.h Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 03/10] PCI: Remove declaration for pci_get_new_domain_nr() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 04/10] PCI: Introduce pci_host_assign_domain_nr() to assign domain Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 05/10] powerpc/PCI: Rename pcibios_root_bridge_prepare() to pcibios_root_bus_prepare() Yijing Wang
2015-07-20 12:01 ` Yijing Wang [this message]
2015-07-20 12:01 ` [PATCH part3 v12 07/10] PCI: Create pci host bridge prior to root bus Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 08/10] PCI: Introduce common pci_domain_nr() and remove platform specific code Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 09/10] PCI: Remove pci_bus_assign_domain_nr() Yijing Wang
2015-07-20 12:01 ` [PATCH part3 v12 10/10] IA64/PCI: Fix build warning found by kbuild test Yijing Wang
2015-12-07 21:53 ` [PATCH part3 v12 00/10] Cleanup platform pci_domain_nr() Bjorn Helgaas
2015-12-08 1:18 ` wangyijing
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=1437393678-4077-7-git-send-email-wangyijing@huawei.com \
--to=wangyijing@huawei.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=dja@axtens.net \
--cc=geert@linux-m68k.org \
--cc=gxt@mprc.pku.edu.cn \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-am33-list@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linux@arm.linux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=liviu@dudau.co.uk \
--cc=rusty@rustcorp.com.au \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.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).