From patchwork Thu May 14 08:56:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 6403561 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A5DEDBEEE1 for ; Thu, 14 May 2015 09:02:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B71312025B for ; Thu, 14 May 2015 09:02:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C43922024D for ; Thu, 14 May 2015 09:02:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YsozJ-0005po-Lt; Thu, 14 May 2015 08:59:29 +0000 Received: from mga11.intel.com ([192.55.52.93]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YsovV-0003CH-Ef for linux-arm-kernel@lists.infradead.org; Thu, 14 May 2015 08:55:34 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 14 May 2015 01:55:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,426,1427785200"; d="scan'208";a="710044419" Received: from gerry-dev.bj.intel.com ([10.238.158.61]) by fmsmga001.fm.intel.com with ESMTP; 14 May 2015 01:55:07 -0700 From: Jiang Liu To: "Rafael J . Wysocki" , Bjorn Helgaas , Marc Zyngier , Hanjun Guo , Yijing Wang , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Jiang Liu Subject: [Patch v3 4/7] x86/PCI: Rename struct pci_sysdata as struct pci_controller Date: Thu, 14 May 2015 16:56:40 +0800 Message-Id: <1431593803-5213-5-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1431593803-5213-1-git-send-email-jiang.liu@linux.intel.com> References: <1431593803-5213-1-git-send-email-jiang.liu@linux.intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150514_015533_635303_030E065B X-CRM114-Status: GOOD ( 15.36 ) X-Spam-Score: -5.0 (-----) Cc: linux-pci@vger.kernel.org, LKML , linux-acpi@vger.kernel.org, Lv Zheng , linux-arm-kernel@lists.infradead.org, "lenb @ kernel . org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 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);