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>, 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: [RFC v2 4/7] x86/PCI: Rename struct pci_sysdata as struct pci_controller Date: Tue, 5 May 2015 10:46:07 +0800 [thread overview] Message-ID: <1430793970-11159-5-git-send-email-jiang.liu@linux.intel.com> (raw) In-Reply-To: <1430793970-11159-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 | 8 ++++---- arch/x86/pci/common.c | 2 +- 4 files changed, 14 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 d93963340c3c..b34a2b660de3 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; @@ -482,7 +482,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { - 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
WARNING: multiple messages have this Message-ID (diff)
From: jiang.liu@linux.intel.com (Jiang Liu) To: linux-arm-kernel@lists.infradead.org Subject: [RFC v2 4/7] x86/PCI: Rename struct pci_sysdata as struct pci_controller Date: Tue, 5 May 2015 10:46:07 +0800 [thread overview] Message-ID: <1430793970-11159-5-git-send-email-jiang.liu@linux.intel.com> (raw) In-Reply-To: <1430793970-11159-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 | 8 ++++---- arch/x86/pci/common.c | 2 +- 4 files changed, 14 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 d93963340c3c..b34a2b660de3 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; @@ -482,7 +482,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { - 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-05-05 2:46 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-05 2:46 [RFC v2 0/7] Consolidate ACPI PCI root common code into ACPI core Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-05 2:46 ` [RFC v2 1/7] ACPI/PCI: Enhance ACPI core to support sparse IO space Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-11 13:01 ` Hanjun Guo 2015-05-11 13:01 ` Hanjun Guo 2015-05-11 13:01 ` Hanjun Guo 2015-05-05 2:46 ` [RFC v2 2/7] ia64/PCI/ACPI: Use common ACPI resource parsing interface for host bridge Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-11 13:04 ` Hanjun Guo 2015-05-11 13:04 ` Hanjun Guo 2015-05-11 13:04 ` Hanjun Guo 2015-05-05 2:46 ` [RFC v2 3/7] ia64/PCI: Use common struct resource_entry to replace struct iospace_resource Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-05 2:46 ` Jiang Liu [this message] 2015-05-05 2:46 ` [RFC v2 4/7] x86/PCI: Rename struct pci_sysdata as struct pci_controller Jiang Liu 2015-05-05 2:46 ` [RFC v2 5/7] PCI/ACPI: Consolidate common PCI host bridge code into ACPI core Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-11 13:36 ` Hanjun Guo 2015-05-11 13:36 ` Hanjun Guo 2015-05-11 13:36 ` Hanjun Guo 2015-05-13 5:36 ` Jiang Liu 2015-05-13 5:36 ` Jiang Liu 2015-05-13 5:36 ` Jiang Liu 2015-05-13 9:29 ` Hanjun Guo 2015-05-13 9:29 ` Hanjun Guo 2015-05-13 12:24 ` Jiang Liu 2015-05-13 12:24 ` Jiang Liu 2015-05-13 13:25 ` Hanjun Guo 2015-05-13 13:25 ` Hanjun Guo 2015-05-14 1:09 ` Jiang Liu 2015-05-14 1:09 ` Jiang Liu 2015-05-14 4:05 ` Hanjun Guo 2015-05-14 4:05 ` Hanjun Guo 2015-05-14 4:42 ` Jiang Liu 2015-05-14 4:42 ` Jiang Liu 2015-05-14 4:42 ` Jiang Liu 2015-05-05 2:46 ` [RFC v2 6/7] x86/PCI/ACPI: Use common interface to support PCI host bridge Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-12 12:19 ` Hanjun Guo 2015-05-12 12:19 ` Hanjun Guo 2015-05-13 5:38 ` Jiang Liu 2015-05-13 5:38 ` Jiang Liu 2015-05-05 2:46 ` [RFC v2 7/7] ia64/PCI/ACPI: " Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-05 2:46 ` Jiang Liu 2015-05-05 3:10 ` [RFC v2 0/7] Consolidate ACPI PCI root common code into ACPI core Hanjun Guo 2015-05-05 3:10 ` 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=1430793970-11159-5-git-send-email-jiang.liu@linux.intel.com \ --to=jiang.liu@linux.intel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.