From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755762AbbFBGLp (ORCPT ); Tue, 2 Jun 2015 02:11:45 -0400 Received: from mga02.intel.com ([134.134.136.20]:35687 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755542AbbFBGLb (ORCPT ); Tue, 2 Jun 2015 02:11:31 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,538,1427785200"; d="scan'208";a="739208570" From: Jiang Liu To: "Rafael J . Wysocki" , Bjorn Helgaas , Marc Zyngier , Hanjun Guo , Liviu Dudau , Yijing Wang , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Jiang Liu Cc: Lv Zheng , "lenb @ kernel . org" , LKML , 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 Message-Id: <1433225576-8215-5-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1433225576-8215-1-git-send-email-jiang.liu@linux.intel.com> References: <1433225576-8215-1-git-send-email-jiang.liu@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename struct pci_sysdata as struct pci_controller, so we could share common code between IA64 and x86 later. Signed-off-by: Jiang Liu --- 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