From patchwork Wed Dec 16 15:16:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 7862771 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id ED1259F1C2 for ; Wed, 16 Dec 2015 15:23:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07FBA2035E for ; Wed, 16 Dec 2015 15:23:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4538520382 for ; Wed, 16 Dec 2015 15:22:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933962AbbLPPWY (ORCPT ); Wed, 16 Dec 2015 10:22:24 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:33342 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934025AbbLPPSE (ORCPT ); Wed, 16 Dec 2015 10:18:04 -0500 Received: by mail-wm0-f51.google.com with SMTP id p187so5706382wmp.0 for ; Wed, 16 Dec 2015 07:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tQUjYncAluGDq/nwJ0yOnGE5FQOgY8GYwsZfs9O8haQ=; b=oPpwjW8vPi6quWxCKG9IkSf7fqUInVxLzi8SaKQfhT4WE/war4WHIfthvXW+XgIh05 m0YW85lZBsD9Yrw1SYMeX/aamVE3jograff2YcjmvsY+KWnb8VJDTwjrj4oDAFesW0Zy bO6wKgwqLOl7gdi1o6I0EuKel8LbIAv1Tz0MD5i0lQbXYklEy6nRQfKcLbCaiSavP1Wh LepdWTpkJetbbxyGaYVVdc92CuXRwkDgcn44Ga5ZfLDcrHKbTgf/b30AKRBQzyWGdIIg mcrGXWTKObHUSPzN+AaGLpoDKXvRFBueyeIzd4Sbos5UyrrxzQgerIhVhBboUhRW6wNE Jmww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tQUjYncAluGDq/nwJ0yOnGE5FQOgY8GYwsZfs9O8haQ=; b=Aom+XGXUh6+NFacKrL7wgcQFi8lgwWNVoPNZIHGaga9w5REm8Xh2cnHc6byKZIMoDg Cu13uBH1X3VppSIScIvr6NaSx1rLly0fCLU4n+g0qNWSxRqkyvBMuX9JVf+teyLAb/4h YwS3Nk65vt8EN57+RbtERWnipvpClA7k0TXJDWy07FFj1yO1xnLkxWaMfJLn2xQEfo+u +QoSlhU7HFo9T7sELULmfSEvQ3a+S8HSrGFoV5Q7G1Od2FzPx2p15pfHGAXOuGwTGZKS NliENbq6ihJxiVxWJDoOiCield+wzQ0wclRI3rhxJ4hbf9qMl23Vzh5nxO7DfRxUZSMG bxgA== X-Gm-Message-State: ALoCoQmVwRGwjhg8O19bt2GN2i/zANqjc5hf1KA+5OZm86PSvgYHD27shhMzgQ3q+vqQHW0fmf56LQ8UKEw+rtMa5n/1/MWQ3Q== X-Received: by 10.28.146.197 with SMTP id u188mr12385902wmd.78.1450279082847; Wed, 16 Dec 2015 07:18:02 -0800 (PST) Received: from tn-HP-4.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id z17sm6438761wjq.1.2015.12.16.07.18.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Dec 2015 07:18:02 -0800 (PST) From: Tomasz Nowicki To: bhelgaas@google.com, arnd@arndb.de, will.deacon@arm.com, catalin.marinas@arm.com, rjw@rjwysocki.net, hanjun.guo@linaro.org, Lorenzo.Pieralisi@arm.com, okaya@codeaurora.org, jiang.liu@linux.intel.com, Stefano.Stabellini@eu.citrix.com Cc: robert.richter@caviumnetworks.com, mw@semihalf.com, Liviu.Dudau@arm.com, ddaney@caviumnetworks.com, tglx@linutronix.de, wangyijing@huawei.com, Suravee.Suthikulpanit@amd.com, msalter@redhat.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, jchandra@broadcom.com, jcm@redhat.com, Tomasz Nowicki Subject: [PATCH V2 13/23] x86, ia64, pci: Remove ACPI companion device from platform specific data. Date: Wed, 16 Dec 2015 16:16:23 +0100 Message-Id: <1450278993-12664-14-git-send-email-tn@semihalf.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450278993-12664-1-git-send-email-tn@semihalf.com> References: <1450278993-12664-1-git-send-email-tn@semihalf.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,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 Since PCI core code is setting ACPI companion device for us now, platform specific ACPI companion device setting turns out to be dead now. Therefore we can get rid of it, including related companion reference from PCI sysdata structure. Signed-off-by: Tomasz Nowicki --- arch/ia64/include/asm/pci.h | 1 - arch/ia64/pci/pci.c | 16 ---------------- arch/x86/include/asm/pci.h | 3 --- arch/x86/pci/acpi.c | 2 -- arch/x86/pci/irq.c | 10 ---------- 5 files changed, 32 deletions(-) diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 07039d1..5050748 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h @@ -65,7 +65,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, #define pci_legacy_write platform_pci_legacy_write struct pci_controller { - struct acpi_device *companion; void *iommu; int segment; int node; /* nearest node with memory or NUMA_NO_NODE for global allocation */ diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 8f6ac2f..978d6af 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -301,28 +301,12 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) } info->controller.segment = root->segment; - info->controller.companion = device; info->controller.node = acpi_get_node(device->handle); INIT_LIST_HEAD(&info->io_resources); return acpi_pci_root_create(root, &pci_acpi_root_ops, &info->common, &info->controller); } -int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) -{ - /* - * We pass NULL as parent to pci_create_root_bus(), so if it is not NULL - * here, pci_create_root_bus() has been called by someone else and - * sysdata is likely to be different from what we expect. Let it go in - * that case. - */ - if (!bridge->dev.parent) { - struct pci_controller *controller = bridge->bus->sysdata; - ACPI_COMPANION_SET(&bridge->dev, controller->companion); - } - return 0; -} - void pcibios_fixup_device_resources(struct pci_dev *dev) { int idx; diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 4625943..a98c022 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -14,9 +14,6 @@ struct pci_sysdata { int domain; /* PCI domain */ int node; /* NUMA node */ -#ifdef CONFIG_ACPI - struct acpi_device *companion; /* ACPI companion device */ -#endif #ifdef CONFIG_X86_64 void *iommu; /* IOMMU private data */ #endif diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 56714a9..286e0f5 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -333,7 +333,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) struct pci_sysdata sd = { .domain = domain, .node = node, - .companion = root->device }; memcpy(bus->sysdata, &sd, sizeof(sd)); @@ -348,7 +347,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) else { info->sd.domain = domain; info->sd.node = node; - info->sd.companion = root->device; bus = acpi_pci_root_create(root, &acpi_pci_root_ops, &info->common, &info->sd); } diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index 7032798..cc62226 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -1153,16 +1153,6 @@ void __init pcibios_irq_init(void) int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { - /* - * We pass NULL as parent to pci_create_root_bus(), so if it is not NULL - * here, pci_create_root_bus() has been called by someone else and - * sysdata is likely to be different from what we expect. Let it go in - * that case. - */ - if (!bridge->dev.parent) { - struct pci_sysdata *sd = bridge->bus->sysdata; - ACPI_COMPANION_SET(&bridge->dev, sd->companion); - } bridge->map_irq = pci_map_irq; return 0; }