From: Jiang Liu <jiang.liu@linux.intel.com>
To: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
Bjorn Helgaas <bhelgaas@google.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Hanjun Guo <hanjun.guo@linaro.org>,
Liviu Dudau <Liviu.Dudau@arm.com>,
Yijing Wang <wangyijing@huawei.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Jiang Liu <jiang.liu@linux.intel.com>
Cc: Lv Zheng <lv.zheng@intel.com>,
"lenb @ kernel . org" <lenb@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [Patch v4 4/8] x86/PCI: Rename struct pci_sysdata as struct pci_controller
Date: Tue, 2 Jun 2015 14:12:52 +0800 [thread overview]
Message-ID: <1433225576-8215-5-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1433225576-8215-1-git-send-email-jiang.liu@linux.intel.com>
Rename struct pci_sysdata as struct pci_controller, so we could share
common code between IA64 and x86 later.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
arch/x86/include/asm/pci.h | 13 +++++++------
arch/x86/include/asm/pci_64.h | 4 ++--
arch/x86/pci/acpi.c | 9 +++++----
arch/x86/pci/common.c | 2 +-
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 4e370a5d8117..243dafd86f87 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -11,15 +11,15 @@
#ifdef __KERNEL__
-struct pci_sysdata {
- int domain; /* PCI domain */
- int node; /* NUMA node */
+struct pci_controller {
#ifdef CONFIG_ACPI
struct acpi_device *companion; /* ACPI companion device */
#endif
#ifdef CONFIG_X86_64
void *iommu; /* IOMMU private data */
#endif
+ int segment; /* PCI domain */
+ int node; /* NUMA node */
};
extern int pci_routeirq;
@@ -31,8 +31,9 @@ extern int noioapicreroute;
#ifdef CONFIG_PCI_DOMAINS
static inline int pci_domain_nr(struct pci_bus *bus)
{
- struct pci_sysdata *sd = bus->sysdata;
- return sd->domain;
+ struct pci_controller *sd = bus->sysdata;
+
+ return sd->segment;
}
static inline int pci_proc_domain(struct pci_bus *bus)
@@ -127,7 +128,7 @@ int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
/* Returns the node based on pci bus */
static inline int __pcibus_to_node(const struct pci_bus *bus)
{
- const struct pci_sysdata *sd = bus->sysdata;
+ const struct pci_controller *sd = bus->sysdata;
return sd->node;
}
diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h
index fe15cfb21b9b..dcbb6b52d4fd 100644
--- a/arch/x86/include/asm/pci_64.h
+++ b/arch/x86/include/asm/pci_64.h
@@ -6,13 +6,13 @@
#ifdef CONFIG_CALGARY_IOMMU
static inline void *pci_iommu(struct pci_bus *bus)
{
- struct pci_sysdata *sd = bus->sysdata;
+ struct pci_controller *sd = bus->sysdata;
return sd->iommu;
}
static inline void set_pci_iommu(struct pci_bus *bus, void *val)
{
- struct pci_sysdata *sd = bus->sysdata;
+ struct pci_controller *sd = bus->sysdata;
sd->iommu = val;
}
#endif /* CONFIG_CALGARY_IOMMU */
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 14a63ed6fe09..a46fff030c09 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -10,7 +10,7 @@
struct pci_root_info {
struct acpi_device *bridge;
char name[16];
- struct pci_sysdata sd;
+ struct pci_controller sd;
#ifdef CONFIG_PCI_MMCONFIG
bool mcfg_added;
u16 segment;
@@ -384,7 +384,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
LIST_HEAD(crs_res);
LIST_HEAD(resources);
struct pci_bus *bus;
- struct pci_sysdata *sd;
+ struct pci_controller *sd;
int node;
if (pci_ignore_seg)
@@ -416,7 +416,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
}
sd = &info->sd;
- sd->domain = domain;
+ sd->segment = domain;
sd->node = node;
sd->companion = device;
@@ -489,9 +489,10 @@ 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_controller *sd = bridge->bus->sysdata;
ACPI_COMPANION_SET(&bridge->dev, sd->companion);
}
+
return 0;
}
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 8fd6f44aee83..10f37d0ce5d8 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -475,7 +475,7 @@ void __init dmi_check_pciprobe(void)
void pcibios_scan_root(int busnum)
{
struct pci_bus *bus;
- struct pci_sysdata *sd;
+ struct pci_controller *sd;
LIST_HEAD(resources);
sd = kzalloc(sizeof(*sd), GFP_KERNEL);
--
1.7.10.4
next prev parent reply other threads:[~2015-06-02 6:11 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 6:12 [Patch v4 0/8] Consolidate ACPI PCI root common code into ACPI core Jiang Liu
2015-06-02 6:12 ` [Patch v4 1/8] ACPI/PCI: Enhance ACPI core to support sparse IO space Jiang Liu
2015-06-02 6:12 ` [Patch v4 2/8] ia64/PCI/ACPI: Use common ACPI resource parsing interface for host bridge Jiang Liu
2015-06-02 6:12 ` [Patch v4 3/8] ia64/PCI: Use common struct resource_entry to replace struct iospace_resource Jiang Liu
2015-06-02 6:12 ` Jiang Liu [this message]
2015-06-02 6:12 ` [Patch v4 5/8] ARM64/PCI/ACPI: Introduce struct pci_controller for ACPI Jiang Liu
2015-06-02 9:35 ` Lorenzo Pieralisi
2015-06-03 8:44 ` Hanjun Guo
2015-06-03 9:36 ` Jiang Liu
2015-06-03 10:03 ` Lorenzo Pieralisi
2015-06-03 10:21 ` Jiang Liu
2015-06-03 12:49 ` Lorenzo Pieralisi
2015-06-02 6:12 ` [Patch v4 6/8] PCI/ACPI: Consolidate common PCI host bridge code into ACPI core Jiang Liu
2015-06-02 6:12 ` [Patch v4 7/8] x86/PCI/ACPI: Use common interface to support PCI host bridge Jiang Liu
2015-06-02 6:12 ` [Patch v4 8/8] ia64/PCI/ACPI: " Jiang Liu
2015-06-02 6:46 ` [Patch v4 0/8] Consolidate ACPI PCI root common code into ACPI core Hanjun Guo
2015-06-03 20:27 ` Al Stone
2015-06-04 1:54 ` Jiang Liu
2015-06-04 6:31 ` Hanjun Guo
2015-06-04 6:41 ` Jiang Liu
2015-06-04 7:02 ` Hanjun Guo
2015-06-04 15:51 ` Mark Salter
2015-06-04 16:29 ` Jiang Liu
2015-06-04 16:57 ` Mark Salter
2015-06-08 3:59 ` Hanjun Guo
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=1433225576-8215-5-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=Liviu.Dudau@arm.com \
--cc=bhelgaas@google.com \
--cc=hanjun.guo@linaro.org \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=marc.zyngier@arm.com \
--cc=mingo@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=wangyijing@huawei.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).