ACPI / PCI: Move the _PRT setup and cleanup code to pci-acpi.c
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 22 Dec 2012 23:02:54 +0000 (00:02 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 3 Jan 2013 12:09:41 +0000 (13:09 +0100)
Move the code related to _PRT setup and removal and to power
resources from acpi_pci_bind() and acpi_pci_unbind() to the .setup()
and .cleanup() callbacks in acpi_pci_bus and remove acpi_pci_bind()
and acpi_pci_unbind() that have no purpose any more.  Accordingly,
remove the code related to device .bind() and .unbind() operations
from the ACPI PCI root bridge driver.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
drivers/acpi/Makefile
drivers/acpi/pci_bind.c [deleted file]
drivers/acpi/pci_root.c
drivers/pci/pci-acpi.c

index 2a4502becd1356cefc5e9b36fc0942a5772eb4ef..4ee2e753306a45a92055e3aaad246d9237abfece 100644 (file)
@@ -37,7 +37,7 @@ acpi-y                                += resource.o
 acpi-y                         += processor_core.o
 acpi-y                         += ec.o
 acpi-$(CONFIG_ACPI_DOCK)       += dock.o
-acpi-y                         += pci_root.o pci_link.o pci_irq.o pci_bind.o
+acpi-y                         += pci_root.o pci_link.o pci_irq.o
 acpi-y                         += acpi_platform.o
 acpi-y                         += power.o
 acpi-y                         += event.o
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
deleted file mode 100644 (file)
index bbddcc9..0000000
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  pci_bind.c - ACPI PCI Device Binding ($Revision: 2 $)
- *
- *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
- *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or (at
- *  your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/pci-acpi.h>
-#include <linux/acpi.h>
-#include <linux/pm_runtime.h>
-#include <acpi/acpi_bus.h>
-#include <acpi/acpi_drivers.h>
-
-#define _COMPONENT             ACPI_PCI_COMPONENT
-ACPI_MODULE_NAME("pci_bind");
-
-static int acpi_pci_unbind(struct acpi_device *device)
-{
-       struct pci_dev *dev;
-
-       dev = acpi_get_pci_dev(device->handle);
-       if (!dev)
-               goto out;
-
-       acpi_power_resource_unregister_device(&dev->dev, device->handle);
-
-       if (!dev->subordinate)
-               goto out;
-
-       acpi_pci_irq_del_prt(pci_domain_nr(dev->bus), dev->subordinate->number);
-
-       device->ops.bind = NULL;
-       device->ops.unbind = NULL;
-
-out:
-       pci_dev_put(dev);
-       return 0;
-}
-
-static int acpi_pci_bind(struct acpi_device *device)
-{
-       acpi_status status;
-       acpi_handle handle;
-       unsigned char bus;
-       struct pci_dev *dev;
-
-       dev = acpi_get_pci_dev(device->handle);
-       if (!dev)
-               return 0;
-
-       acpi_power_resource_register_device(&dev->dev, device->handle);
-
-       /*
-        * Install the 'bind' function to facilitate callbacks for
-        * children of the P2P bridge.
-        */
-       if (dev->subordinate) {
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                 "Device %04x:%02x:%02x.%d is a PCI bridge\n",
-                                 pci_domain_nr(dev->bus), dev->bus->number,
-                                 PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)));
-               device->ops.bind = acpi_pci_bind;
-               device->ops.unbind = acpi_pci_unbind;
-       }
-
-       /*
-        * Evaluate and parse _PRT, if exists.  This code allows parsing of
-        * _PRT objects within the scope of non-bridge devices.  Note that
-        * _PRTs within the scope of a PCI bridge assume the bridge's
-        * subordinate bus number.
-        *
-        * TBD: Can _PRTs exist within the scope of non-bridge PCI devices?
-        */
-       status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
-       if (ACPI_FAILURE(status))
-               goto out;
-
-       if (dev->subordinate)
-               bus = dev->subordinate->number;
-       else
-               bus = dev->bus->number;
-
-       acpi_pci_irq_add_prt(device->handle, pci_domain_nr(dev->bus), bus);
-
-out:
-       pci_dev_put(dev);
-       return 0;
-}
-
-int acpi_pci_bind_root(struct acpi_device *device)
-{
-       device->ops.bind = acpi_pci_bind;
-       device->ops.unbind = acpi_pci_unbind;
-
-       return 0;
-}
index 0e593a203ff8307cf0e1ee8f361ad4a71b688ded..22a8458b4ec90d0c4f0793a04e401b97b4061d5e 100644 (file)
@@ -186,21 +186,6 @@ static acpi_status try_get_root_bridge_busnr(acpi_handle handle,
        return AE_OK;
 }
 
-static void acpi_pci_bridge_scan(struct acpi_device *device)
-{
-       int status;
-       struct acpi_device *child = NULL;
-
-       if (device->flags.bus_address)
-               if (device->parent && device->parent->ops.bind) {
-                       status = device->parent->ops.bind(device);
-                       if (!status) {
-                               list_for_each_entry(child, &device->children, node)
-                                       acpi_pci_bridge_scan(child);
-                       }
-               }
-}
-
 static u8 pci_osc_uuid_str[] = "33DB4D5B-1FF7-401C-9657-7441C03DD766";
 
 static acpi_status acpi_pci_run_osc(acpi_handle handle,
@@ -450,7 +435,6 @@ static int acpi_pci_root_add(struct acpi_device *device)
        int result;
        struct acpi_pci_root *root;
        acpi_handle handle;
-       struct acpi_device *child;
        struct acpi_pci_driver *driver;
        u32 flags, base_flags;
        bool is_osc_granted = false;
@@ -602,21 +586,6 @@ static int acpi_pci_root_add(struct acpi_device *device)
                goto out_del_root;
        }
 
-       /*
-        * Attach ACPI-PCI Context
-        * -----------------------
-        * Thus binding the ACPI and PCI devices.
-        */
-       result = acpi_pci_bind_root(device);
-       if (result)
-               goto out_del_root;
-
-       /*
-        * Scan and bind all _ADR-Based Devices
-        */
-       list_for_each_entry(child, &device->children, node)
-               acpi_pci_bridge_scan(child);
-
        /* ASPM setting */
        if (is_osc_granted) {
                if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM)
index b98106c110e76d4b862e427ba31a2aa7c8582459..42736e213f25aa0e119f25262945ba6ad8c58e44 100644 (file)
@@ -320,12 +320,33 @@ static int acpi_pci_find_root_bridge(struct device *dev, acpi_handle *handle)
        return 0;
 }
 
-static void acpi_pci_wakeup_setup(struct device *dev)
+static void pci_acpi_setup(struct device *dev)
 {
-       struct acpi_device *adev = acpi_dev_pm_get_node(dev);
        struct pci_dev *pci_dev = to_pci_dev(dev);
+       acpi_handle handle = ACPI_HANDLE(dev);
+       struct acpi_device *adev;
+       acpi_status status;
+       acpi_handle dummy;
 
-       if (!adev || !adev->wakeup.flags.valid)
+       /*
+        * Evaluate and parse _PRT, if exists.  This code allows parsing of
+        * _PRT objects within the scope of non-bridge devices.  Note that
+        * _PRTs within the scope of a PCI bridge assume the bridge's
+        * subordinate bus number.
+        *
+        * TBD: Can _PRTs exist within the scope of non-bridge PCI devices?
+        */
+       status = acpi_get_handle(handle, METHOD_NAME__PRT, &dummy);
+       if (ACPI_SUCCESS(status)) {
+               unsigned char bus;
+
+               bus = pci_dev->subordinate ?
+                       pci_dev->subordinate->number : pci_dev->bus->number;
+               acpi_pci_irq_add_prt(handle, pci_domain_nr(pci_dev->bus), bus);
+       }
+
+       acpi_power_resource_register_device(dev, handle);
+       if (acpi_bus_get_device(handle, &adev) || !adev->wakeup.flags.valid)
                return;
 
        device_set_wakeup_capable(dev, true);
@@ -336,23 +357,30 @@ static void acpi_pci_wakeup_setup(struct device *dev)
                device_set_run_wake(dev, true);
 }
 
-static void acpi_pci_wakeup_cleanup(struct device *dev)
+static void pci_acpi_cleanup(struct device *dev)
 {
-       struct acpi_device *adev = acpi_dev_pm_get_node(dev);
+       struct pci_dev *pci_dev = to_pci_dev(dev);
+       acpi_handle handle = ACPI_HANDLE(dev);
+       struct acpi_device *adev;
 
-       if (adev && adev->wakeup.flags.valid) {
+       if (!acpi_bus_get_device(handle, &adev) && adev->wakeup.flags.valid) {
                device_set_wakeup_capable(dev, false);
                device_set_run_wake(dev, false);
                pci_acpi_remove_pm_notifier(adev);
        }
+       acpi_power_resource_unregister_device(dev, handle);
+
+       if (pci_dev->subordinate)
+               acpi_pci_irq_del_prt(pci_domain_nr(pci_dev->bus),
+                                    pci_dev->subordinate->number);
 }
 
 static struct acpi_bus_type acpi_pci_bus = {
        .bus = &pci_bus_type,
        .find_device = acpi_pci_find_device,
        .find_bridge = acpi_pci_find_root_bridge,
-       .setup = acpi_pci_wakeup_setup,
-       .cleanup = acpi_pci_wakeup_cleanup,
+       .setup = pci_acpi_setup,
+       .cleanup = pci_acpi_cleanup,
 };
 
 static int __init acpi_pci_init(void)