32 files changed, 1147 insertions, 685 deletions

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 4d1ce2e7361e..7d63f8ced24b 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the PCI bus specific drivers.
 #
 
-obj-y           += access.o bus.o probe.o remove.o pci.o quirks.o \
+obj-y           += access.o bus.o probe.o remove.o pci.o quirks.o slot.o \
                         pci-driver.o search.o pci-sysfs.o rom.o setup-res.o
 obj-$(CONFIG_PROC_FS) += proc.o
 
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index f8c187a763bd..93e37f0666ab 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -30,6 +30,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
+#include <linux/pci-acpi.h>
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/actypes.h>
@@ -299,7 +300,7 @@ free_and_return:
  *
  * @handle - the handle of the hotplug controller.
  */
-acpi_status acpi_run_oshp(acpi_handle handle)
+static acpi_status acpi_run_oshp(acpi_handle handle)
 {
         acpi_status             status;
         struct acpi_buffer      string = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -322,9 +323,6 @@ acpi_status acpi_run_oshp(acpi_handle handle)
         kfree(string.pointer);
         return status;
 }
-EXPORT_SYMBOL_GPL(acpi_run_oshp);
-
-
 
 /* acpi_get_hp_params_from_firmware
  *
@@ -374,6 +372,85 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus,
 }
 EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware);
 
+/**
+ * acpi_get_hp_hw_control_from_firmware
+ * @dev: the pci_dev of the bridge that has a hotplug controller
+ * @flags: requested control bits for _OSC
+ *
+ * Attempt to take hotplug control from firmware.
+ */
+int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags)
+{
+        acpi_status status;
+        acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));
+        struct pci_dev *pdev = dev;
+        struct pci_bus *parent;
+        struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };
+
+        flags &= (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
+                  OSC_SHPC_NATIVE_HP_CONTROL |
+                  OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
+        if (!flags) {
+                err("Invalid flags %u specified!\n", flags);
+                return -EINVAL;
+        }
+
+        /*
+         * Per PCI firmware specification, we should run the ACPI _OSC
+         * method to get control of hotplug hardware before using it. If
+         * an _OSC is missing, we look for an OSHP to do the same thing.
+         * To handle different BIOS behavior, we look for _OSC and OSHP
+         * within the scope of the hotplug controller and its parents,
+         * upto the host bridge under which this controller exists.
+         */
+        while (!handle) {
+                /*
+                 * This hotplug controller was not listed in the ACPI name
+                 * space at all. Try to get acpi handle of parent pci bus.
+                 */
+                if (!pdev || !pdev->bus->parent)
+                        break;
+                parent = pdev->bus->parent;
+                dbg("Could not find %s in acpi namespace, trying parent\n",
+                    pci_name(pdev));
+                if (!parent->self)
+                        /* Parent must be a host bridge */
+                        handle = acpi_get_pci_rootbridge_handle(
+                                        pci_domain_nr(parent),
+                                        parent->number);
+                else
+                        handle = DEVICE_ACPI_HANDLE(&(parent->self->dev));
+                pdev = parent->self;
+        }
+
+        while (handle) {
+                acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
+                dbg("Trying to get hotplug control for %s \n",
+                    (char *)string.pointer);
+                status = pci_osc_control_set(handle, flags);
+                if (status == AE_NOT_FOUND)
+                        status = acpi_run_oshp(handle);
+                if (ACPI_SUCCESS(status)) {
+                        dbg("Gained control for hotplug HW for pci %s (%s)\n",
+                            pci_name(dev), (char *)string.pointer);
+                        kfree(string.pointer);
+                        return 0;
+                }
+                if (acpi_root_bridge(handle))
+                        break;
+                chandle = handle;
+                status = acpi_get_parent(chandle, &handle);
+                if (ACPI_FAILURE(status))
+                        break;
+        }
+
+        dbg("Cannot get control of hotplug hardware for pci %s\n",
+            pci_name(dev));
+
+        kfree(string.pointer);
+        return -ENODEV;
+}
+EXPORT_SYMBOL(acpi_get_hp_hw_control_from_firmware);
 
 /* acpi_root_bridge - check to see if this acpi object is a root bridge
  *
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index 7a29164d4b32..eecf7cbf4139 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -215,7 +215,6 @@ extern u8 acpiphp_get_power_status (struct acpiphp_slot *slot);
 extern u8 acpiphp_get_attention_status (struct acpiphp_slot *slot);
 extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot);
 extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);
-extern u32 acpiphp_get_address (struct acpiphp_slot *slot);
 
 /* variables */
 extern int acpiphp_debug;
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index 7af68ba27903..0e496e866a84 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -70,7 +70,6 @@ static int disable_slot		(struct hotplug_slot *slot);
 static int set_attention_status (struct hotplug_slot *slot, u8 value);
 static int get_power_status     (struct hotplug_slot *slot, u8 *value);
 static int get_attention_status (struct hotplug_slot *slot, u8 *value);
-static int get_address          (struct hotplug_slot *slot, u32 *value);
 static int get_latch_status     (struct hotplug_slot *slot, u8 *value);
 static int get_adapter_status   (struct hotplug_slot *slot, u8 *value);
 
@@ -83,7 +82,6 @@ static struct hotplug_slot_ops acpi_hotplug_slot_ops = {
         .get_attention_status   = get_attention_status,
         .get_latch_status       = get_latch_status,
         .get_adapter_status     = get_adapter_status,
-        .get_address            = get_address,
 };
 
 
@@ -274,23 +272,6 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
         return 0;
 }
 
-
-/**
- * get_address - get pci address of a slot
- * @hotplug_slot: slot to get status
- * @value: pointer to struct pci_busdev (seg, bus, dev)
- */
-static int get_address(struct hotplug_slot *hotplug_slot, u32 *value)
-{
-        struct slot *slot = hotplug_slot->private;
-
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
-
-        *value = acpiphp_get_address(slot->acpi_slot);
-
-        return 0;
-}
-
 static int __init init_acpi(void)
 {
         int retval;
@@ -357,7 +338,11 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot)
         acpiphp_slot->slot = slot;
         snprintf(slot->name, sizeof(slot->name), "%u", slot->acpi_slot->sun);
 
-        retval = pci_hp_register(slot->hotplug_slot);
+        retval = pci_hp_register(slot->hotplug_slot,
+                                        acpiphp_slot->bridge->pci_bus,
+                                        acpiphp_slot->device);
+        if (retval == -EBUSY)
+                goto error_hpslot;
         if (retval) {
                 err("pci_hp_register failed with error %d\n", retval);
                 goto error_hpslot;
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 648596d469f6..9342c848db29 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -258,7 +258,12 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
                                 bridge->pci_bus->number, slot->device);
                 retval = acpiphp_register_hotplug_slot(slot);
                 if (retval) {
-                        warn("acpiphp_register_hotplug_slot failed(err code = 0x%x)\n", retval);
+                        if (retval == -EBUSY)
+                                warn("Slot %d already registered by another "
+                                        "hotplug driver\n", slot->sun);
+                        else
+                                warn("acpiphp_register_hotplug_slot failed "
+                                        "(err code = 0x%x)\n", retval);
                         goto err_exit;
                 }
         }
@@ -1867,19 +1872,3 @@ u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot)
 
         return (sta == 0) ? 0 : 1;
 }
-
-
-/*
- * pci address (seg/bus/dev)
- */
-u32 acpiphp_get_address(struct acpiphp_slot *slot)
-{
-        u32 address;
-        struct pci_bus *pci_bus = slot->bridge->pci_bus;
-
-        address = (pci_domain_nr(pci_bus) << 16) |
-                  (pci_bus->number << 8) |
-                  slot->device;
-
-        return address;
-}
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index ede9051fdb5d..2b7c45e39370 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -33,8 +33,10 @@
 #include <linux/kobject.h>
 #include <asm/uaccess.h>
 #include <linux/moduleparam.h>
+#include <linux/pci.h>
 
 #include "acpiphp.h"
+#include "../pci.h"
 
 #define DRIVER_VERSION  "1.0.1"
 #define DRIVER_AUTHOR   "Irene Zubarev <zubarev@us.ibm.com>, Vernon Mauery <vernux@us.ibm.com>"
@@ -430,7 +432,7 @@ static int __init ibm_acpiphp_init(void)
         int retval = 0;
         acpi_status status;
         struct acpi_device *device;
-        struct kobject *sysdir = &pci_hotplug_slots_kset->kobj;
+        struct kobject *sysdir = &pci_slots_kset->kobj;
 
         dbg("%s\n", __func__);
 
@@ -477,7 +479,7 @@ init_return:
 static void __exit ibm_acpiphp_exit(void)
 {
         acpi_status status;
-        struct kobject *sysdir = &pci_hotplug_slots_kset->kobj;
+        struct kobject *sysdir = &pci_slots_kset->kobj;
 
         dbg("%s\n", __func__);
 
diff --git a/drivers/pci/hotplug/cpci_hotplug_core.c b/drivers/pci/hotplug/cpci_hotplug_core.c
index d8a6b80ab42a..935947991dc9 100644
--- a/drivers/pci/hotplug/cpci_hotplug_core.c
+++ b/drivers/pci/hotplug/cpci_hotplug_core.c
@@ -285,7 +285,7 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last)
                 info->attention_status = cpci_get_attention_status(slot);
 
                 dbg("registering slot %s", slot->hotplug_slot->name);
-                status = pci_hp_register(slot->hotplug_slot);
+                status = pci_hp_register(slot->hotplug_slot, bus, i);
                 if (status) {
                         err("pci_hp_register failed with error %d", status);
                         goto error_name;
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 36b115b27b0b..54defec51d08 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -434,7 +434,9 @@ static int ctrl_slot_setup(struct controller *ctrl,
                                 slot->bus, slot->device,
                                 slot->number, ctrl->slot_device_offset,
                                 slot_number);
-                result = pci_hp_register(hotplug_slot);
+                result = pci_hp_register(hotplug_slot,
+                                         ctrl->pci_dev->subordinate,
+                                         slot->device);
                 if (result) {
                         err("pci_hp_register failed with error %d\n", result);
                         goto error_name;
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 7e9a827c2687..40337a06c18a 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -66,6 +66,7 @@ struct dummy_slot {
         struct pci_dev *dev;
         struct work_struct remove_work;
         unsigned long removed;
+        char name[8];
 };
 
 static int debug;
@@ -100,6 +101,7 @@ static int add_slot(struct pci_dev *dev)
         struct dummy_slot *dslot;
         struct hotplug_slot *slot;
         int retval = -ENOMEM;
+        static int count = 1;
 
         slot = kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
         if (!slot)
@@ -113,18 +115,18 @@ static int add_slot(struct pci_dev *dev)
         slot->info->max_bus_speed = PCI_SPEED_UNKNOWN;
         slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN;
 
-        slot->name = &dev->dev.bus_id[0];
-        dbg("slot->name = %s\n", slot->name);
-
         dslot = kzalloc(sizeof(struct dummy_slot), GFP_KERNEL);
         if (!dslot)
                 goto error_info;
 
+        slot->name = dslot->name;
+        snprintf(slot->name, sizeof(dslot->name), "fake%d", count++);
+        dbg("slot->name = %s\n", slot->name);
         slot->ops = &dummy_hotplug_slot_ops;
         slot->release = &dummy_release;
         slot->private = dslot;
 
-        retval = pci_hp_register(slot);
+        retval = pci_hp_register(slot, dev->bus, PCI_SLOT(dev->devfn));
         if (retval) {
                 err("pci_hp_register failed with error %d\n", retval);
                 goto error_dslot;
@@ -148,17 +150,17 @@ error:
 static int __init pci_scan_buses(void)
 {
         struct pci_dev *dev = NULL;
-        int retval = 0;
+        int lastslot = 0;
 
         while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-                retval = add_slot(dev);
-                if (retval) {
-                        pci_dev_put(dev);
-                        break;
-                }
+                if (PCI_FUNC(dev->devfn) > 0 &&
+                                lastslot == PCI_SLOT(dev->devfn))
+                        continue;
+                lastslot = PCI_SLOT(dev->devfn);
+                add_slot(dev);
         }
 
-        return retval;
+        return 0;
 }
 
 static void remove_slot(struct dummy_slot *dslot)
@@ -296,23 +298,9 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
         return 0;
 }
 
-/* find the hotplug_slot for the pci_dev */
-static struct hotplug_slot *get_slot_from_dev(struct pci_dev *dev)
-{
-        struct dummy_slot *dslot;
-
-        list_for_each_entry(dslot, &slot_list, node) {
-                if (dslot->dev == dev)
-                        return dslot->slot;
-        }
-        return NULL;
-}
-
-
 static int disable_slot(struct hotplug_slot *slot)
 {
         struct dummy_slot *dslot;
-        struct hotplug_slot *hslot;
         struct pci_dev *dev;
         int func;
 
@@ -322,41 +310,27 @@ static int disable_slot(struct hotplug_slot *slot)
 
         dbg("%s - physical_slot = %s\n", __func__, slot->name);
 
-        /* don't disable bridged devices just yet, we can't handle them easily... */
-        if (dslot->dev->subordinate) {
-                err("Can't remove PCI devices with other PCI devices behind it yet.\n");
-                return -ENODEV;
-        }
-        if (test_and_set_bit(0, &dslot->removed)) {
-                dbg("Slot already scheduled for removal\n");
-                return -ENODEV;
-        }
-        /* search for subfunctions and disable them first */
-        if (!(dslot->dev->devfn & 7)) {
-                for (func = 1; func < 8; func++) {
-                        dev = pci_get_slot(dslot->dev->bus,
-                                        dslot->dev->devfn + func);
-                        if (dev) {
-                                hslot = get_slot_from_dev(dev);
-                                if (hslot)
-                                        disable_slot(hslot);
-                                else {
-                                        err("Hotplug slot not found for subfunction of PCI device\n");
-                                        return -ENODEV;
-                                }
-                                pci_dev_put(dev);
-                        } else
-                                dbg("No device in slot found\n");
+        for (func = 7; func >= 0; func--) {
+                dev = pci_get_slot(dslot->dev->bus, dslot->dev->devfn + func);
+                if (!dev)
+                        continue;
+
+                if (test_and_set_bit(0, &dslot->removed)) {
+                        dbg("Slot already scheduled for removal\n");
+                        return -ENODEV;
                 }
-        }
 
-        /* remove the device from the pci core */
-        pci_remove_bus_device(dslot->dev);
+                /* queue work item to blow away this sysfs entry and other
+                 * parts.
+                 */
+                INIT_WORK(&dslot->remove_work, remove_slot_worker);
+                queue_work(dummyphp_wq, &dslot->remove_work);
 
-        /* queue work item to blow away this sysfs entry and other parts. */
-        INIT_WORK(&dslot->remove_work, remove_slot_worker);
-        queue_work(dummyphp_wq, &dslot->remove_work);
+                /* blow away this sysfs entry and other parts. */
+                remove_slot(dslot);
 
+                pci_dev_put(dev);
+        }
         return 0;
 }
 
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index dca7efc14be2..8467d0287325 100644
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -1001,7 +1001,8 @@ static int __init ebda_rsrc_controller (void)
                 tmp_slot = list_entry (list, struct slot, ibm_slot_list);
 
                 snprintf (tmp_slot->hotplug_slot->name, 30, "%s", create_file_name (tmp_slot));
-                pci_hp_register (tmp_slot->hotplug_slot);
+                pci_hp_register(tmp_slot->hotplug_slot,
+                        pci_find_bus(0, tmp_slot->bus), tmp_slot->device);
         }
 
         print_ebda_hpc ();
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index a11021e8ce37..b3b2d8cf4370 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -40,6 +40,7 @@
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
 #include <asm/uaccess.h>
+#include "../pci.h"
 
 #define MY_NAME "pci_hotplug"
 
@@ -60,41 +61,7 @@ static int debug;
 //////////////////////////////////////////////////////////////////
 
 static LIST_HEAD(pci_hotplug_slot_list);
-
-struct kset *pci_hotplug_slots_kset;
-
-static ssize_t hotplug_slot_attr_show(struct kobject *kobj,
-                struct attribute *attr, char *buf)
-{
-        struct hotplug_slot *slot = to_hotplug_slot(kobj);
-        struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr);
-        return attribute->show ? attribute->show(slot, buf) : -EIO;
-}
-
-static ssize_t hotplug_slot_attr_store(struct kobject *kobj,
-                struct attribute *attr, const char *buf, size_t len)
-{
-        struct hotplug_slot *slot = to_hotplug_slot(kobj);
-        struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr);
-        return attribute->store ? attribute->store(slot, buf, len) : -EIO;
-}
-
-static struct sysfs_ops hotplug_slot_sysfs_ops = {
-        .show = hotplug_slot_attr_show,
-        .store = hotplug_slot_attr_store,
-};
-
-static void hotplug_slot_release(struct kobject *kobj)
-{
-        struct hotplug_slot *slot = to_hotplug_slot(kobj);
-        if (slot->release)
-                slot->release(slot);
-}
-
-static struct kobj_type hotplug_slot_ktype = {
-        .sysfs_ops = &hotplug_slot_sysfs_ops,
-        .release = &hotplug_slot_release,
-};
+static DEFINE_SPINLOCK(pci_hotplug_slot_list_lock);
 
 /* these strings match up with the values in pci_bus_speed */
 static char *pci_bus_speed_strings[] = {
@@ -149,16 +116,15 @@ GET_STATUS(power_status, u8)
 GET_STATUS(attention_status, u8)
 GET_STATUS(latch_status, u8)
 GET_STATUS(adapter_status, u8)
-GET_STATUS(address, u32)
 GET_STATUS(max_bus_speed, enum pci_bus_speed)
 GET_STATUS(cur_bus_speed, enum pci_bus_speed)
 
-static ssize_t power_read_file (struct hotplug_slot *slot, char *buf)
+static ssize_t power_read_file(struct pci_slot *slot, char *buf)
 {
         int retval;
         u8 value;
 
-        retval = get_power_status (slot, &value);
+        retval = get_power_status(slot->hotplug, &value);
         if (retval)
                 goto exit;
         retval = sprintf (buf, "%d\n", value);
@@ -166,9 +132,10 @@ exit:
         return retval;
 }
 
-static ssize_t power_write_file (struct hotplug_slot *slot, const char *buf,
+static ssize_t power_write_file(struct pci_slot *pci_slot, const char *buf,
                 size_t count)
 {
+        struct hotplug_slot *slot = pci_slot->hotplug;
         unsigned long lpower;
         u8 power;
         int retval = 0;
@@ -204,29 +171,30 @@ exit:
         return count;
 }
 
-static struct hotplug_slot_attribute hotplug_slot_attr_power = {
+static struct pci_slot_attribute hotplug_slot_attr_power = {
         .attr = {.name = "power", .mode = S_IFREG | S_IRUGO | S_IWUSR},
         .show = power_read_file,
         .store = power_write_file
 };
 
-static ssize_t attention_read_file (struct hotplug_slot *slot, char *buf)
+static ssize_t attention_read_file(struct pci_slot *slot, char *buf)
 {
         int retval;
         u8 value;
 
-        retval = get_attention_status (slot, &value);
+        retval = get_attention_status(slot->hotplug, &value);
         if (retval)
                 goto exit;
-        retval = sprintf (buf, "%d\n", value);
+        retval = sprintf(buf, "%d\n", value);
 
 exit:
         return retval;
 }
 
-static ssize_t attention_write_file (struct hotplug_slot *slot, const char *buf,
+static ssize_t attention_write_file(struct pci_slot *slot, const char *buf,
                 size_t count)
 {
+        struct hotplug_slot_ops *ops = slot->hotplug->ops;
         unsigned long lattention;
         u8 attention;
         int retval = 0;
@@ -235,13 +203,13 @@ static ssize_t attention_write_file (struct hotplug_slot *slot, const char *buf,
         attention = (u8)(lattention & 0xff);
         dbg (" - attention = %d\n", attention);
 
-        if (!try_module_get(slot->ops->owner)) {
+        if (!try_module_get(ops->owner)) {
                 retval = -ENODEV;
                 goto exit;
         }
-        if (slot->ops->set_attention_status)
-                retval = slot->ops->set_attention_status(slot, attention);
-        module_put(slot->ops->owner);
+        if (ops->set_attention_status)
+                retval = ops->set_attention_status(slot->hotplug, attention);
+        module_put(ops->owner);
 
 exit:   
         if (retval)
@@ -249,18 +217,18 @@ exit:
         return count;
 }
 
-static struct hotplug_slot_attribute hotplug_slot_attr_attention = {
+static struct pci_slot_attribute hotplug_slot_attr_attention = {
         .attr = {.name = "attention", .mode = S_IFREG | S_IRUGO | S_IWUSR},
         .show = attention_read_file,
         .store = attention_write_file
 };
 
-static ssize_t latch_read_file (struct hotplug_slot *slot, char *buf)
+static ssize_t latch_read_file(struct pci_slot *slot, char *buf)
 {
         int retval;
         u8 value;
 
-        retval = get_latch_status (slot, &value);
+        retval = get_latch_status(slot->hotplug, &value);
         if (retval)
                 goto exit;
         retval = sprintf (buf, "%d\n", value);
@@ -269,17 +237,17 @@ exit:
         return retval;
 }
 
-static struct hotplug_slot_attribute hotplug_slot_attr_latch = {
+static struct pci_slot_attribute hotplug_slot_attr_latch = {
         .attr = {.name = "latch", .mode = S_IFREG | S_IRUGO},
         .show = latch_read_file,
 };
 
-static ssize_t presence_read_file (struct hotplug_slot *slot, char *buf)
+static ssize_t presence_read_file(struct pci_slot *slot, char *buf)
 {
         int retval;
         u8 value;
 
-        retval = get_adapter_status (slot, &value);
+        retval = get_adapter_status(slot->hotplug, &value);
         if (retval)
                 goto exit;
         retval = sprintf (buf, "%d\n", value);
@@ -288,42 +256,20 @@ exit:
         return retval;
 }
 
-static struct hotplug_slot_attribute hotplug_slot_attr_presence = {
+static struct pci_slot_attribute hotplug_slot_attr_presence = {
         .attr = {.name = "adapter", .mode = S_IFREG | S_IRUGO},
         .show = presence_read_file,
 };
 
-static ssize_t address_read_file (struct hotplug_slot *slot, char *buf)
-{
-        int retval;
-        u32 address;
-
-        retval = get_address (slot, &address);
-        if (retval)
-                goto exit;
-        retval = sprintf (buf, "%04x:%02x:%02x\n",
-                          (address >> 16) & 0xffff,
-                          (address >> 8) & 0xff,
-                          address & 0xff);
-
-exit:
-        return retval;
-}
-
-static struct hotplug_slot_attribute hotplug_slot_attr_address = {
-        .attr = {.name = "address", .mode = S_IFREG | S_IRUGO},
-        .show = address_read_file,
-};
-
 static char *unknown_speed = "Unknown bus speed";
 
-static ssize_t max_bus_speed_read_file (struct hotplug_slot *slot, char *buf)
+static ssize_t max_bus_speed_read_file(struct pci_slot *slot, char *buf)
 {
         char *speed_string;
         int retval;
         enum pci_bus_speed value;
         
-        retval = get_max_bus_speed (slot, &value);
+        retval = get_max_bus_speed(slot->hotplug, &value);
         if (retval)
                 goto exit;
 
@@ -338,18 +284,18 @@ exit:
         return retval;
 }
 
-static struct hotplug_slot_attribute hotplug_slot_attr_max_bus_speed = {
+static struct pci_slot_attribute hotplug_slot_attr_max_bus_speed = {
         .attr = {.name = "max_bus_speed", .mode = S_IFREG | S_IRUGO},
         .show = max_bus_speed_read_file,
 };
 
-static ssize_t cur_bus_speed_read_file (struct hotplug_slot *slot, char *buf)
+static ssize_t cur_bus_speed_read_file(struct pci_slot *slot, char *buf)
 {
         char *speed_string;
         int retval;
         enum pci_bus_speed value;
 
-        retval = get_cur_bus_speed (slot, &value);
+        retval = get_cur_bus_speed(slot->hotplug, &value);
         if (retval)
                 goto exit;
 
@@ -364,14 +310,15 @@ exit:
         return retval;
 }
 
-static struct hotplug_slot_attribute hotplug_slot_attr_cur_bus_speed = {
+static struct pci_slot_attribute hotplug_slot_attr_cur_bus_speed = {
         .attr = {.name = "cur_bus_speed", .mode = S_IFREG | S_IRUGO},
         .show = cur_bus_speed_read_file,
 };
 
-static ssize_t test_write_file (struct hotplug_slot *slot, const char *buf,
+static ssize_t test_write_file(struct pci_slot *pci_slot, const char *buf,
                 size_t count)
 {
+        struct hotplug_slot *slot = pci_slot->hotplug;
         unsigned long ltest;
         u32 test;
         int retval = 0;
@@ -394,13 +341,14 @@ exit:
         return count;
 }
 
-static struct hotplug_slot_attribute hotplug_slot_attr_test = {
+static struct pci_slot_attribute hotplug_slot_attr_test = {
         .attr = {.name = "test", .mode = S_IFREG | S_IRUGO | S_IWUSR},
         .store = test_write_file
 };
 
-static int has_power_file (struct hotplug_slot *slot)
+static int has_power_file(struct pci_slot *pci_slot)
 {
+        struct hotplug_slot *slot = pci_slot->hotplug;
         if ((!slot) || (!slot->ops))
                 return -ENODEV;
         if ((slot->ops->enable_slot) ||
@@ -410,8 +358,9 @@ static int has_power_file (struct hotplug_slot *slot)
         return -ENOENT;
 }
 
-static int has_attention_file (struct hotplug_slot *slot)
+static int has_attention_file(struct pci_slot *pci_slot)
 {
+        struct hotplug_slot *slot = pci_slot->hotplug;
         if ((!slot) || (!slot->ops))
                 return -ENODEV;
         if ((slot->ops->set_attention_status) ||
@@ -420,8 +369,9 @@ static int has_attention_file (struct hotplug_slot *slot)
         return -ENOENT;
 }
 
-static int has_latch_file (struct hotplug_slot *slot)
+static int has_latch_file(struct pci_slot *pci_slot)
 {
+        struct hotplug_slot *slot = pci_slot->hotplug;
         if ((!slot) || (!slot->ops))
                 return -ENODEV;
         if (slot->ops->get_latch_status)
@@ -429,8 +379,9 @@ static int has_latch_file (struct hotplug_slot *slot)
         return -ENOENT;
 }
 
-static int has_adapter_file (struct hotplug_slot *slot)
+static int has_adapter_file(struct pci_slot *pci_slot)
 {
+        struct hotplug_slot *slot = pci_slot->hotplug;
         if ((!slot) || (!slot->ops))
                 return -ENODEV;
         if (slot->ops->get_adapter_status)
@@ -438,17 +389,9 @@ static int has_adapter_file (struct hotplug_slot *slot)
         return -ENOENT;
 }
 
-static int has_address_file (struct hotplug_slot *slot)
-{
-        if ((!slot) || (!slot->ops))
-                return -ENODEV;
-        if (slot->ops->get_address)
-                return 0;
-        return -ENOENT;
-}
-
-static int has_max_bus_speed_file (struct hotplug_slot *slot)
+static int has_max_bus_speed_file(struct pci_slot *pci_slot)
 {
+        struct hotplug_slot *slot = pci_slot->hotplug;
         if ((!slot) || (!slot->ops))
                 return -ENODEV;
         if (slot->ops->get_max_bus_speed)
@@ -456,8 +399,9 @@ static int has_max_bus_speed_file (struct hotplug_slot *slot)
         return -ENOENT;
 }
 
-static int has_cur_bus_speed_file (struct hotplug_slot *slot)
+static int has_cur_bus_speed_file(struct pci_slot *pci_slot)
 {
+        struct hotplug_slot *slot = pci_slot->hotplug;
         if ((!slot) || (!slot->ops))
                 return -ENODEV;
         if (slot->ops->get_cur_bus_speed)
@@ -465,8 +409,9 @@ static int has_cur_bus_speed_file (struct hotplug_slot *slot)
         return -ENOENT;
 }
 
-static int has_test_file (struct hotplug_slot *slot)
+static int has_test_file(struct pci_slot *pci_slot)
 {
+        struct hotplug_slot *slot = pci_slot->hotplug;
         if ((!slot) || (!slot->ops))
                 return -ENODEV;
         if (slot->ops->hardware_test)
@@ -474,7 +419,7 @@ static int has_test_file (struct hotplug_slot *slot)
         return -ENOENT;
 }
 
-static int fs_add_slot (struct hotplug_slot *slot)
+static int fs_add_slot(struct pci_slot *slot)
 {
         int retval = 0;
 
@@ -505,13 +450,6 @@ static int fs_add_slot (struct hotplug_slot *slot)
                         goto exit_adapter;
         }
 
-        if (has_address_file(slot) == 0) {
-                retval = sysfs_create_file(&slot->kobj,
-                                           &hotplug_slot_attr_address.attr);
-                if (retval)
-                        goto exit_address;
-        }
-
         if (has_max_bus_speed_file(slot) == 0) {
                 retval = sysfs_create_file(&slot->kobj,
                                            &hotplug_slot_attr_max_bus_speed.attr);
@@ -544,10 +482,6 @@ exit_cur_speed:
                 sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_max_bus_speed.attr);
 
 exit_max_speed:
-        if (has_address_file(slot) == 0)
-                sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_address.attr);
-
-exit_address:
         if (has_adapter_file(slot) == 0)
                 sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_presence.attr);
 
@@ -567,7 +501,7 @@ exit:
         return retval;
 }
 
-static void fs_remove_slot (struct hotplug_slot *slot)
+static void fs_remove_slot(struct pci_slot *slot)
 {
         if (has_power_file(slot) == 0)
                 sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_power.attr);
@@ -581,9 +515,6 @@ static void fs_remove_slot (struct hotplug_slot *slot)
         if (has_adapter_file(slot) == 0)
                 sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_presence.attr);
 
-        if (has_address_file(slot) == 0)
-                sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_address.attr);
-
         if (has_max_bus_speed_file(slot) == 0)
                 sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_max_bus_speed.attr);
 
@@ -599,12 +530,16 @@ static struct hotplug_slot *get_slot_from_name (const char *name)
         struct hotplug_slot *slot;
         struct list_head *tmp;
 
+        spin_lock(&pci_hotplug_slot_list_lock);
         list_for_each (tmp, &pci_hotplug_slot_list) {
                 slot = list_entry (tmp, struct hotplug_slot, slot_list);
                 if (strcmp(slot->name, name) == 0)
-                        return slot;
+                        goto out;
         }
-        return NULL;
+        slot = NULL;
+out:
+        spin_unlock(&pci_hotplug_slot_list_lock);
+        return slot;
 }
 
 /**
@@ -616,9 +551,10 @@ static struct hotplug_slot *get_slot_from_name (const char *name)
  *
  * Returns 0 if successful, anything else for an error.
  */
-int pci_hp_register (struct hotplug_slot *slot)
+int pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, int slot_nr)
 {
         int result;
+        struct pci_slot *pci_slot;
         struct hotplug_slot *tmp;
 
         if (slot == NULL)
@@ -636,19 +572,44 @@ int pci_hp_register (struct hotplug_slot *slot)
         if (tmp)
                 return -EEXIST;
 
-        slot->kobj.kset = pci_hotplug_slots_kset;
-        result = kobject_init_and_add(&slot->kobj, &hotplug_slot_ktype, NULL,
-                                      "%s", slot->name);
-        if (result) {
-                err("Unable to register kobject '%s'", slot->name);
-                return -EINVAL;
+        /*
+         * No problems if we call this interface from both ACPI_PCI_SLOT
+         * driver and call it here again. If we've already created the
+         * pci_slot, the interface will simply bump the refcount.
+         */
+        pci_slot = pci_create_slot(bus, slot_nr, slot->name);
+        if (IS_ERR(pci_slot))
+                return PTR_ERR(pci_slot);
+
+        if (pci_slot->hotplug) {
+                dbg("%s: already claimed\n", __func__);
+                pci_destroy_slot(pci_slot);
+                return -EBUSY;
         }
 
-        list_add (&slot->slot_list, &pci_hotplug_slot_list);
+        slot->pci_slot = pci_slot;
+        pci_slot->hotplug = slot;
+
+        /*
+         * Allow pcihp drivers to override the ACPI_PCI_SLOT name.
+         */
+        if (strcmp(kobject_name(&pci_slot->kobj), slot->name)) {
+                result = kobject_rename(&pci_slot->kobj, slot->name);
+                if (result) {
+                        pci_destroy_slot(pci_slot);
+                        return result;
+                }
+        }
+
+        spin_lock(&pci_hotplug_slot_list_lock);
+        list_add(&slot->slot_list, &pci_hotplug_slot_list);
+        spin_unlock(&pci_hotplug_slot_list_lock);
+
+        result = fs_add_slot(pci_slot);
+        kobject_uevent(&pci_slot->kobj, KOBJ_ADD);
+        dbg("Added slot %s to the list\n", slot->name);
+
 
-        result = fs_add_slot (slot);
-        kobject_uevent(&slot->kobj, KOBJ_ADD);
-        dbg ("Added slot %s to the list\n", slot->name);
         return result;
 }
 
@@ -661,22 +622,30 @@ int pci_hp_register (struct hotplug_slot *slot)
  *
  * Returns 0 if successful, anything else for an error.
  */
-int pci_hp_deregister (struct hotplug_slot *slot)
+int pci_hp_deregister(struct hotplug_slot *hotplug)
 {
         struct hotplug_slot *temp;
+        struct pci_slot *slot;
 
-        if (slot == NULL)
+        if (!hotplug)
                 return -ENODEV;
 
-        temp = get_slot_from_name (slot->name);
-        if (temp != slot) {
+        temp = get_slot_from_name(hotplug->name);
+        if (temp != hotplug)
                 return -ENODEV;
-        }
-        list_del (&slot->slot_list);
 
-        fs_remove_slot (slot);
-        dbg ("Removed slot %s from the list\n", slot->name);
-        kobject_put(&slot->kobj);
+        spin_lock(&pci_hotplug_slot_list_lock);
+        list_del(&hotplug->slot_list);
+        spin_unlock(&pci_hotplug_slot_list_lock);
+
+        slot = hotplug->pci_slot;
+        fs_remove_slot(slot);
+        dbg("Removed slot %s from the list\n", hotplug->name);
+
+        hotplug->release(hotplug);
+        slot->hotplug = NULL;
+        pci_destroy_slot(slot);
+
         return 0;
 }
 
@@ -690,13 +659,15 @@ int pci_hp_deregister (struct hotplug_slot *slot)
  *
  * Returns 0 if successful, anything else for an error.
  */
-int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot,
+int __must_check pci_hp_change_slot_info(struct hotplug_slot *hotplug,
                                          struct hotplug_slot_info *info)
 {
-        if ((slot == NULL) || (info == NULL))
+        struct pci_slot *slot;
+        if (!hotplug || !info)
                 return -ENODEV;
+        slot = hotplug->pci_slot;
 
-        memcpy (slot->info, info, sizeof (struct hotplug_slot_info));
+        memcpy(hotplug->info, info, sizeof(struct hotplug_slot_info));
 
         return 0;
 }
@@ -704,36 +675,22 @@ int __must_check pci_hp_change_slot_info(struct hotplug_slot *slot,
 static int __init pci_hotplug_init (void)
 {
         int result;
-        struct kset *pci_bus_kset;
 
-        pci_bus_kset = bus_get_kset(&pci_bus_type);
-
-        pci_hotplug_slots_kset = kset_create_and_add("slots", NULL,
-                                                     &pci_bus_kset->kobj);
-        if (!pci_hotplug_slots_kset) {
-                result = -ENOMEM;
-                err("Register subsys error\n");
-                goto exit;
-        }
         result = cpci_hotplug_init(debug);
         if (result) {
                 err ("cpci_hotplug_init with error %d\n", result);
-                goto err_subsys;
+                goto err_cpci;
         }
 
         info (DRIVER_DESC " version: " DRIVER_VERSION "\n");
-        goto exit;
 
-err_subsys:
-        kset_unregister(pci_hotplug_slots_kset);
-exit:
+err_cpci:
         return result;
 }
 
 static void __exit pci_hotplug_exit (void)
 {
         cpci_hotplug_exit();
-        kset_unregister(pci_hotplug_slots_kset);
 }
 
 module_init(pci_hotplug_init);
@@ -745,7 +702,6 @@ MODULE_LICENSE("GPL");
 module_param(debug, bool, 0644);
 MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
 
-EXPORT_SYMBOL_GPL(pci_hotplug_slots_kset);
 EXPORT_SYMBOL_GPL(pci_hp_register);
 EXPORT_SYMBOL_GPL(pci_hp_deregister);
 EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 79c9ddaad3fb..8492fab800cc 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -202,8 +202,13 @@ struct hpc_ops {
 #include <acpi/actypes.h>
 #include <linux/pci-acpi.h>
 
-#define pciehp_get_hp_hw_control_from_firmware(dev)                     \
-        pciehp_acpi_get_hp_hw_control_from_firmware(dev)
+static inline int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
+{
+        u32 flags = (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
+                     OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
+        return acpi_get_hp_hw_control_from_firmware(dev, flags);
+}
+
 static inline int pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
                         struct hotplug_params *hpp)
 {
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 48a2ed378914..7b21c86e4bff 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -41,7 +41,7 @@ int pciehp_debug;
 int pciehp_poll_mode;
 int pciehp_poll_time;
 int pciehp_force;
-int pciehp_slot_with_bus;
+static int pciehp_slot_with_bus;
 struct workqueue_struct *pciehp_wq;
 
 #define DRIVER_VERSION  "0.4"
@@ -72,7 +72,6 @@ static int get_power_status	(struct hotplug_slot *slot, u8 *value);
 static int get_attention_status (struct hotplug_slot *slot, u8 *value);
 static int get_latch_status     (struct hotplug_slot *slot, u8 *value);
 static int get_adapter_status   (struct hotplug_slot *slot, u8 *value);
-static int get_address          (struct hotplug_slot *slot, u32 *value);
 static int get_max_bus_speed    (struct hotplug_slot *slot, enum pci_bus_speed *value);
 static int get_cur_bus_speed    (struct hotplug_slot *slot, enum pci_bus_speed *value);
 
@@ -85,7 +84,6 @@ static struct hotplug_slot_ops pciehp_hotplug_slot_ops = {
         .get_attention_status = get_attention_status,
         .get_latch_status =     get_latch_status,
         .get_adapter_status =   get_adapter_status,
-        .get_address =          get_address,
         .get_max_bus_speed =    get_max_bus_speed,
         .get_cur_bus_speed =    get_cur_bus_speed,
 };
@@ -252,7 +250,9 @@ static int init_slots(struct controller *ctrl)
                 dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x "
                     "slot_device_offset=%x\n", slot->bus, slot->device,
                     slot->hp_slot, slot->number, ctrl->slot_device_offset);
-                retval = pci_hp_register(hotplug_slot);
+                retval = pci_hp_register(hotplug_slot,
+                                         ctrl->pci_dev->subordinate,
+                                         slot->device);
                 if (retval) {
                         err("pci_hp_register failed with error %d\n", retval);
                         if (retval == -EEXIST)
@@ -263,7 +263,7 @@ static int init_slots(struct controller *ctrl)
                 }
                 /* create additional sysfs entries */
                 if (EMI(ctrl)) {
-                        retval = sysfs_create_file(&hotplug_slot->kobj,
+                        retval = sysfs_create_file(&hotplug_slot->pci_slot->kobj,
                                 &hotplug_slot_attr_lock.attr);
                         if (retval) {
                                 pci_hp_deregister(hotplug_slot);
@@ -296,7 +296,7 @@ static void cleanup_slots(struct controller *ctrl)
                 slot = list_entry(tmp, struct slot, slot_list);
                 list_del(&slot->slot_list);
                 if (EMI(ctrl))
-                        sysfs_remove_file(&slot->hotplug_slot->kobj,
+                        sysfs_remove_file(&slot->hotplug_slot->pci_slot->kobj,
                                 &hotplug_slot_attr_lock.attr);
                 cancel_delayed_work(&slot->work);
                 flush_scheduled_work();
@@ -398,19 +398,8 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
         return 0;
 }
 
-static int get_address(struct hotplug_slot *hotplug_slot, u32 *value)
-{
-        struct slot *slot = hotplug_slot->private;
-        struct pci_bus *bus = slot->ctrl->pci_dev->subordinate;
-
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
-
-        *value = (pci_domain_nr(bus) << 16) | (slot->bus << 8) | slot->device;
-
-        return 0;
-}
-
-static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
+static int get_max_bus_speed(struct hotplug_slot *hotplug_slot,
+                                enum pci_bus_speed *value)
 {
         struct slot *slot = hotplug_slot->private;
         int retval;
@@ -444,7 +433,13 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         struct controller *ctrl;
         struct slot *t_slot;
         u8 value;
-        struct pci_dev *pdev;
+        struct pci_dev *pdev = dev->port;
+
+        if (pciehp_force)
+                dbg("Bypassing BIOS check for pciehp use on %s\n",
+                    pci_name(pdev));
+        else if (pciehp_get_hp_hw_control_from_firmware(pdev))
+                goto err_out_none;
 
         ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
         if (!ctrl) {
@@ -453,9 +448,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         }
         INIT_LIST_HEAD(&ctrl->slot_list);
 
-        pdev = dev->port;
-        ctrl->pci_dev = pdev;
-
         rc = pcie_init(ctrl, dev);
         if (rc) {
                 dbg("%s: controller initialization failed\n", PCIE_MODULE_NAME);
@@ -471,7 +463,12 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         /* Setup the slot information structures */
         rc = init_slots(ctrl);
         if (rc) {
-                err("%s: slot initialization failed\n", PCIE_MODULE_NAME);
+                if (rc == -EBUSY)
+                        warn("%s: slot already registered by another "
+                                "hotplug driver\n", PCIE_MODULE_NAME);
+                else
+                        err("%s: slot initialization failed\n",
+                                PCIE_MODULE_NAME);
                 goto err_out_release_ctlr;
         }
 
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 79f104963166..0cfaedf2edca 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -268,9 +268,8 @@ completed:
         return timeout;
 }
 
-static inline int pcie_wait_cmd(struct controller *ctrl, int poll)
+static inline void pcie_wait_cmd(struct controller *ctrl, int poll)
 {
-        int retval = 0;
         unsigned int msecs = pciehp_poll_mode ? 2500 : 1000;
         unsigned long timeout = msecs_to_jiffies(msecs);
         int rc;
@@ -278,16 +277,9 @@ static inline int pcie_wait_cmd(struct controller *ctrl, int poll)
         if (poll)
                 rc = pcie_poll_cmd(ctrl);
         else
-                rc = wait_event_interruptible_timeout(ctrl->queue,
-                                              !ctrl->cmd_busy, timeout);
+                rc = wait_event_timeout(ctrl->queue, !ctrl->cmd_busy, timeout);
         if (!rc)
                 dbg("Command not completed in 1000 msec\n");
-        else if (rc < 0) {
-                retval = -EINTR;
-                info("Command was interrupted by a signal\n");
-        }
-
-        return retval;
 }
 
 /**
@@ -365,7 +357,7 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
                 if (!(slot_ctrl & HP_INTR_ENABLE) ||
                     !(slot_ctrl & CMD_CMPL_INTR_ENABLE))
                         poll = 1;
-                retval = pcie_wait_cmd(ctrl, poll);
+                pcie_wait_cmd(ctrl, poll);
         }
  out:
         mutex_unlock(&ctrl->ctrl_lock);
@@ -785,7 +777,7 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
                 intr_loc |= detected;
                 if (!intr_loc)
                         return IRQ_NONE;
-                if (pciehp_writew(ctrl, SLOTSTATUS, detected)) {
+                if (detected && pciehp_writew(ctrl, SLOTSTATUS, detected)) {
                         err("%s: Cannot write to SLOTSTATUS\n", __func__);
                         return IRQ_NONE;
                 }
@@ -797,7 +789,7 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
         if (intr_loc & CMD_COMPLETED) {
                 ctrl->cmd_busy = 0;
                 smp_mb();
-                wake_up_interruptible(&ctrl->queue);
+                wake_up(&ctrl->queue);
         }
 
         if (!(intr_loc & ~CMD_COMPLETED))
@@ -1017,75 +1009,6 @@ static struct hpc_ops pciehp_hpc_ops = {
         .check_lnk_status               = hpc_check_lnk_status,
 };
 
-#ifdef CONFIG_ACPI
-static int pciehp_acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev)
-{
-        acpi_status status;
-        acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));
-        struct pci_dev *pdev = dev;
-        struct pci_bus *parent;
-        struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };
-
-        /*
-         * Per PCI firmware specification, we should run the ACPI _OSC
-         * method to get control of hotplug hardware before using it.
-         * If an _OSC is missing, we look for an OSHP to do the same thing.
-         * To handle different BIOS behavior, we look for _OSC and OSHP
-         * within the scope of the hotplug controller and its parents, upto
-         * the host bridge under which this controller exists.
-         */
-        while (!handle) {
-                /*
-                 * This hotplug controller was not listed in the ACPI name
-                 * space at all. Try to get acpi handle of parent pci bus.
-                 */
-                if (!pdev || !pdev->bus->parent)
-                        break;
-                parent = pdev->bus->parent;
-                dbg("Could not find %s in acpi namespace, trying parent\n",
-                                pci_name(pdev));
-                if (!parent->self)
-                        /* Parent must be a host bridge */
-                        handle = acpi_get_pci_rootbridge_handle(
-                                        pci_domain_nr(parent),
-                                        parent->number);
-                else
-                        handle = DEVICE_ACPI_HANDLE(
-                                        &(parent->self->dev));
-                pdev = parent->self;
-        }
-
-        while (handle) {
-                acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
-                dbg("Trying to get hotplug control for %s \n",
-                        (char *)string.pointer);
-                status = pci_osc_control_set(handle,
-                                OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL |
-                                OSC_PCI_EXPRESS_NATIVE_HP_CONTROL);
-                if (status == AE_NOT_FOUND)
-                        status = acpi_run_oshp(handle);
-                if (ACPI_SUCCESS(status)) {
-                        dbg("Gained control for hotplug HW for pci %s (%s)\n",
-                                pci_name(dev), (char *)string.pointer);
-                        kfree(string.pointer);
-                        return 0;
-                }
-                if (acpi_root_bridge(handle))
-                        break;
-                chandle = handle;
-                status = acpi_get_parent(chandle, &handle);
-                if (ACPI_FAILURE(status))
-                        break;
-        }
-
-        dbg("Cannot get control of hotplug hardware for pci %s\n",
-                        pci_name(dev));
-
-        kfree(string.pointer);
-        return -1;
-}
-#endif
-
 static int pcie_init_hardware_part1(struct controller *ctrl,
                                     struct pcie_device *dev)
 {
@@ -1122,23 +1045,10 @@ int pcie_init_hardware_part2(struct controller *ctrl, struct pcie_device *dev)
 
         if (pcie_write_cmd(ctrl, cmd, mask)) {
                 err("%s: Cannot enable software notification\n", __func__);
-                goto abort;
+                return -1;
         }
 
-        if (pciehp_force)
-                dbg("Bypassing BIOS check for pciehp use on %s\n",
-                                pci_name(ctrl->pci_dev));
-        else if (pciehp_get_hp_hw_control_from_firmware(ctrl->pci_dev))
-                goto abort_disable_intr;
-
         return 0;
-
-        /* We end up here for the many possible ways to fail this API. */
-abort_disable_intr:
-        if (pcie_write_cmd(ctrl, 0, HP_INTR_ENABLE))
-                err("%s : disabling interrupts failed\n", __func__);
-abort:
-        return -1;
 }
 
 static inline void dbg_ctrl(struct controller *ctrl)
@@ -1176,7 +1086,7 @@ static inline void dbg_ctrl(struct controller *ctrl)
         dbg("  Comamnd Completed    : %3s\n", NO_CMD_CMPL(ctrl)? "no" : "yes");
         pciehp_readw(ctrl, SLOTSTATUS, &reg16);
         dbg("Slot Status            : 0x%04x\n", reg16);
-        pciehp_readw(ctrl, SLOTSTATUS, &reg16);
+        pciehp_readw(ctrl, SLOTCTRL, &reg16);
         dbg("Slot Control           : 0x%04x\n", reg16);
 }
 
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c
index 779c5db71be4..a796301ea03f 100644
--- a/drivers/pci/hotplug/rpadlpar_sysfs.c
+++ b/drivers/pci/hotplug/rpadlpar_sysfs.c
@@ -14,8 +14,10 @@
  */
 #include <linux/kobject.h>
 #include <linux/string.h>
+#include <linux/pci.h>
 #include <linux/pci_hotplug.h>
 #include "rpadlpar.h"
+#include "../pci.h"
 
 #define DLPAR_KOBJ_NAME       "control"
 
@@ -27,7 +29,6 @@
 
 #define MAX_DRC_NAME_LEN 64
 
-
 static ssize_t add_slot_store(struct kobject *kobj, struct kobj_attribute *attr,
                               const char *buf, size_t nbytes)
 {
@@ -112,7 +113,7 @@ int dlpar_sysfs_init(void)
         int error;
 
         dlpar_kobj = kobject_create_and_add(DLPAR_KOBJ_NAME,
-                                            &pci_hotplug_slots_kset->kobj);
+                                            &pci_slots_kset->kobj);
         if (!dlpar_kobj)
                 return -EINVAL;
 
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 56197b600d36..9b714ea93d20 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -33,33 +33,6 @@
 #include <asm/rtas.h>
 #include "rpaphp.h"
 
-static ssize_t address_read_file (struct hotplug_slot *php_slot, char *buf)
-{
-        int retval;
-        struct slot *slot = (struct slot *)php_slot->private;
-        struct pci_bus *bus;
-
-        if (!slot)
-                return -ENOENT;
-
-        bus = slot->bus;
-        if (!bus)
-                return -ENOENT;
-
-        if (bus->self)
-                retval = sprintf(buf, pci_name(bus->self));
-        else
-                retval = sprintf(buf, "%04x:%02x:00.0",
-                        pci_domain_nr(bus), bus->number);
-
-        return retval;
-}
-
-static struct hotplug_slot_attribute php_attr_address = {
-        .attr = {.name = "address", .mode = S_IFREG | S_IRUGO},
-        .show = address_read_file,
-};
-
 /* free up the memory used by a slot */
 static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
 {
@@ -135,9 +108,6 @@ int rpaphp_deregister_slot(struct slot *slot)
 
         list_del(&slot->rpaphp_slot_list);
         
-        /* remove "address" file */
-        sysfs_remove_file(&php_slot->kobj, &php_attr_address.attr);
-
         retval = pci_hp_deregister(php_slot);
         if (retval)
                 err("Problem unregistering a slot %s\n", slot->name);
@@ -151,6 +121,7 @@ int rpaphp_register_slot(struct slot *slot)
 {
         struct hotplug_slot *php_slot = slot->hotplug_slot;
         int retval;
+        int slotno;
 
         dbg("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n", 
                 __func__, slot->dn->full_name, slot->index, slot->name,
@@ -162,19 +133,16 @@ int rpaphp_register_slot(struct slot *slot)
                 return -EAGAIN;
         }       
 
-        retval = pci_hp_register(php_slot);
+        if (slot->dn->child)
+                slotno = PCI_SLOT(PCI_DN(slot->dn->child)->devfn);
+        else
+                slotno = -1;
+        retval = pci_hp_register(php_slot, slot->bus, slotno);
         if (retval) {
                 err("pci_hp_register failed with error %d\n", retval);
                 return retval;
         }
 
-        /* create "address" file */
-        retval = sysfs_create_file(&php_slot->kobj, &php_attr_address.attr);
-        if (retval) {
-                err("sysfs_create_file failed with error %d\n", retval);
-                goto sysfs_fail;
-        }
-
         /* add slot to our internal list */
         list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
         info("Slot [%s] registered\n", slot->name);
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 2fe37cd85b69..410fe0394a8e 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -197,13 +197,15 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,
 static struct hotplug_slot * sn_hp_destroy(void)
 {
         struct slot *slot;
+        struct pci_slot *pci_slot;
         struct hotplug_slot *bss_hotplug_slot = NULL;
 
         list_for_each_entry(slot, &sn_hp_list, hp_list) {
                 bss_hotplug_slot = slot->hotplug_slot;
+                pci_slot = bss_hotplug_slot->pci_slot;
                 list_del(&((struct slot *)bss_hotplug_slot->private)->
                          hp_list);
-                sysfs_remove_file(&bss_hotplug_slot->kobj,
+                sysfs_remove_file(&pci_slot->kobj,
                                   &sn_slot_path_attr.attr);
                 break;
         }
@@ -614,6 +616,7 @@ static void sn_release_slot(struct hotplug_slot *bss_hotplug_slot)
 static int sn_hotplug_slot_register(struct pci_bus *pci_bus)
 {
         int device;
+        struct pci_slot *pci_slot;
         struct hotplug_slot *bss_hotplug_slot;
         int rc = 0;
 
@@ -650,11 +653,12 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus)
                 bss_hotplug_slot->ops = &sn_hotplug_slot_ops;
                 bss_hotplug_slot->release = &sn_release_slot;
 
-                rc = pci_hp_register(bss_hotplug_slot);
+                rc = pci_hp_register(bss_hotplug_slot, pci_bus, device);
                 if (rc)
                         goto register_err;
 
-                rc = sysfs_create_file(&bss_hotplug_slot->kobj,
+                pci_slot = bss_hotplug_slot->pci_slot;
+                rc = sysfs_create_file(&pci_slot->kobj,
                                        &sn_slot_path_attr.attr);
                 if (rc)
                         goto register_err;
@@ -664,7 +668,7 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus)
 
 register_err:
         dev_dbg(&pci_bus->self->dev, "bus failed to register with err = %d\n",
-                rc);
+                rc);
 
 alloc_err:
         if (rc == -ENOMEM)
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index f66e8d6315ab..8a026f750deb 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -170,6 +170,7 @@ extern void shpchp_queue_pushbutton_work(struct work_struct *work);
 extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev);
 
 #ifdef CONFIG_ACPI
+#include <linux/pci-acpi.h>
 static inline int get_hp_params_from_firmware(struct pci_dev *dev,
                                               struct hotplug_params *hpp)
 {
@@ -177,14 +178,15 @@ static inline int get_hp_params_from_firmware(struct pci_dev *dev,
                         return -ENODEV;
         return 0;
 }
-#define get_hp_hw_control_from_firmware(pdev)                           \
-        do {                                                            \
-                if (DEVICE_ACPI_HANDLE(&(pdev->dev)))                   \
-                        acpi_run_oshp(DEVICE_ACPI_HANDLE(&(pdev->dev)));\
-        } while (0)
+
+static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev)
+{
+        u32 flags = OSC_SHPC_NATIVE_HP_CONTROL;
+        return acpi_get_hp_hw_control_from_firmware(dev, flags);
+}
 #else
 #define get_hp_params_from_firmware(dev, hpp) (-ENODEV)
-#define get_hp_hw_control_from_firmware(dev) do { } while (0)
+#define get_hp_hw_control_from_firmware(dev) (0)
 #endif
 
 struct ctrl_reg {
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 97848654652a..a8cbd039b85b 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -39,7 +39,7 @@
 int shpchp_debug;
 int shpchp_poll_mode;
 int shpchp_poll_time;
-int shpchp_slot_with_bus;
+static int shpchp_slot_with_bus;
 struct workqueue_struct *shpchp_wq;
 
 #define DRIVER_VERSION  "0.4"
@@ -68,7 +68,6 @@ static int get_power_status	(struct hotplug_slot *slot, u8 *value);
 static int get_attention_status (struct hotplug_slot *slot, u8 *value);
 static int get_latch_status     (struct hotplug_slot *slot, u8 *value);
 static int get_adapter_status   (struct hotplug_slot *slot, u8 *value);
-static int get_address          (struct hotplug_slot *slot, u32 *value);
 static int get_max_bus_speed    (struct hotplug_slot *slot, enum pci_bus_speed *value);
 static int get_cur_bus_speed    (struct hotplug_slot *slot, enum pci_bus_speed *value);
 
@@ -81,7 +80,6 @@ static struct hotplug_slot_ops shpchp_hotplug_slot_ops = {
         .get_attention_status = get_attention_status,
         .get_latch_status =     get_latch_status,
         .get_adapter_status =   get_adapter_status,
-        .get_address =          get_address,
         .get_max_bus_speed =    get_max_bus_speed,
         .get_cur_bus_speed =    get_cur_bus_speed,
 };
@@ -159,7 +157,8 @@ static int init_slots(struct controller *ctrl)
                 dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x "
                     "slot_device_offset=%x\n", slot->bus, slot->device,
                     slot->hp_slot, slot->number, ctrl->slot_device_offset);
-                retval = pci_hp_register(slot->hotplug_slot);
+                retval = pci_hp_register(slot->hotplug_slot,
+                                ctrl->pci_dev->subordinate, slot->device);
                 if (retval) {
                         err("pci_hp_register failed with error %d\n", retval);
                         if (retval == -EEXIST)
@@ -288,19 +287,8 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)
         return 0;
 }
 
-static int get_address (struct hotplug_slot *hotplug_slot, u32 *value)
-{
-        struct slot *slot = get_slot(hotplug_slot);
-        struct pci_bus *bus = slot->ctrl->pci_dev->subordinate;
-
-        dbg("%s - physical_slot = %s\n", __func__, hotplug_slot->name);
-
-        *value = (pci_domain_nr(bus) << 16) | (slot->bus << 8) | slot->device;
-
-        return 0;
-}
-
-static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
+static int get_max_bus_speed(struct hotplug_slot *hotplug_slot,
+                                enum pci_bus_speed *value)
 {
         struct slot *slot = get_slot(hotplug_slot);
         int retval;
@@ -330,13 +318,14 @@ static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_sp
 
 static int is_shpc_capable(struct pci_dev *dev)
 {
-       if ((dev->vendor == PCI_VENDOR_ID_AMD) || (dev->device ==
-                               PCI_DEVICE_ID_AMD_GOLAM_7450))
-               return 1;
-       if (pci_find_capability(dev, PCI_CAP_ID_SHPC))
-               return 1;
-
-       return 0;
+        if ((dev->vendor == PCI_VENDOR_ID_AMD) || (dev->device ==
+                                                PCI_DEVICE_ID_AMD_GOLAM_7450))
+                return 1;
+        if (!pci_find_capability(dev, PCI_CAP_ID_SHPC))
+                return 0;
+        if (get_hp_hw_control_from_firmware(dev))
+                return 0;
+        return 1;
 }
 
 static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 7d770b2cd889..7a0bff364cd4 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -1084,7 +1084,6 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
         dbg("%s: HPC at b:d:f:irq=0x%x:%x:%x:%x\n", __func__,
                         pdev->bus->number, PCI_SLOT(pdev->devfn),
                         PCI_FUNC(pdev->devfn), pdev->irq);
-        get_hp_hw_control_from_firmware(pdev);
 
         /*
          * If this is the first controller to be initialized,
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 66c0fd21894b..4f05d91a0fd8 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1725,7 +1725,6 @@ int __init init_dmars(void)
         deferred_flush = kzalloc(g_num_of_iommus *
                 sizeof(struct deferred_flush_tables), GFP_KERNEL);
         if (!deferred_flush) {
-                kfree(g_iommus);
                 ret = -ENOMEM;
                 goto error;
         }
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 8c61304cbb37..ccb1974464fb 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -70,12 +70,10 @@ arch_teardown_msi_irqs(struct pci_dev *dev)
         }
 }
 
-static void msi_set_enable(struct pci_dev *dev, int enable)
+static void __msi_set_enable(struct pci_dev *dev, int pos, int enable)
 {
-        int pos;
         u16 control;
 
-        pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
         if (pos) {
                 pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control);
                 control &= ~PCI_MSI_FLAGS_ENABLE;
@@ -85,6 +83,11 @@ static void msi_set_enable(struct pci_dev *dev, int enable)
         }
 }
 
+static void msi_set_enable(struct pci_dev *dev, int enable)
+{
+        __msi_set_enable(dev, pci_find_capability(dev, PCI_CAP_ID_MSI), enable);
+}
+
 static void msix_set_enable(struct pci_dev *dev, int enable)
 {
         int pos;
@@ -141,7 +144,8 @@ static void msi_set_mask_bits(unsigned int irq, u32 mask, u32 flag)
                         mask_bits |= flag & mask;
                         pci_write_config_dword(entry->dev, pos, mask_bits);
                 } else {
-                        msi_set_enable(entry->dev, !flag);
+                        __msi_set_enable(entry->dev, entry->msi_attrib.pos,
+                                         !flag);
                 }
                 break;
         case PCI_CAP_ID_MSIX:
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index dab9d471914c..056ea80ee27a 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -21,12 +21,19 @@
 
 struct acpi_osc_data {
         acpi_handle handle;
-        u32 ctrlset_buf[3];
-        u32 global_ctrlsets;
+        u32 support_set;
+        u32 control_set;
+        int is_queried;
+        u32 query_result;
         struct list_head sibiling;
 };
 static LIST_HEAD(acpi_osc_data_list);
 
+struct acpi_osc_args {
+        u32 capbuf[3];
+        u32 query_result;
+};
+
 static struct acpi_osc_data *acpi_get_osc_data(acpi_handle handle)
 {
         struct acpi_osc_data *data;
@@ -44,42 +51,18 @@ static struct acpi_osc_data *acpi_get_osc_data(acpi_handle handle)
         return data;
 }
 
-static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
+static u8 OSC_UUID[16] = {0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40,
+                          0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66};
 
-static acpi_status  
-acpi_query_osc (
-        acpi_handle     handle,
-        u32             level,
-        void            *context,
-        void            **retval )
+static acpi_status acpi_run_osc(acpi_handle handle,
+                                struct acpi_osc_args *osc_args)
 {
-        acpi_status             status;
-        struct acpi_object_list input;
-        union acpi_object       in_params[4];
-        struct acpi_buffer      output = {ACPI_ALLOCATE_BUFFER, NULL};
-        union acpi_object       *out_obj;
-        u32                     osc_dw0;
-        acpi_status *ret_status = (acpi_status *)retval;
-        struct acpi_osc_data *osc_data;
-        u32 flags = (unsigned long)context, temp;
-        acpi_handle tmp;
-
-        status = acpi_get_handle(handle, "_OSC", &tmp);
-        if (ACPI_FAILURE(status))
-                return status;
-
-        osc_data = acpi_get_osc_data(handle);
-        if (!osc_data) {
-                printk(KERN_ERR "acpi osc data array is full\n");
-                return AE_ERROR;
-        }
-
-        osc_data->ctrlset_buf[OSC_SUPPORT_TYPE] |= (flags & OSC_SUPPORT_MASKS);
-
-        /* do _OSC query for all possible controls */
-        temp = osc_data->ctrlset_buf[OSC_CONTROL_TYPE];
-        osc_data->ctrlset_buf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
-        osc_data->ctrlset_buf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
+        acpi_status status;
+        struct acpi_object_list input;
+        union acpi_object in_params[4];
+        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
+        union acpi_object *out_obj;
+        u32 osc_dw0, flags = osc_args->capbuf[OSC_QUERY_TYPE];
 
         /* Setting up input parameters */
         input.count = 4;
@@ -93,20 +76,19 @@ acpi_query_osc (
         in_params[2].integer.value      = 3;
         in_params[3].type               = ACPI_TYPE_BUFFER;
         in_params[3].buffer.length      = 12;
-        in_params[3].buffer.pointer     = (u8 *)osc_data->ctrlset_buf;
+        in_params[3].buffer.pointer     = (u8 *)osc_args->capbuf;
 
         status = acpi_evaluate_object(handle, "_OSC", &input, &output);
         if (ACPI_FAILURE(status))
-                goto out_nofree;
-        out_obj = output.pointer;
+                return status;
 
+        out_obj = output.pointer;
         if (out_obj->type != ACPI_TYPE_BUFFER) {
-                printk(KERN_DEBUG  
-                        "Evaluate _OSC returns wrong type\n");
+                printk(KERN_DEBUG "Evaluate _OSC returns wrong type\n");
                 status = AE_TYPE;
-                goto query_osc_out;
+                goto out_kfree;
         }
-        osc_dw0 = *((u32 *) out_obj->buffer.pointer);
+        osc_dw0 = *((u32 *)out_obj->buffer.pointer);
         if (osc_dw0) {
                 if (osc_dw0 & OSC_REQUEST_ERROR)
                         printk(KERN_DEBUG "_OSC request fails\n"); 
@@ -115,93 +97,58 @@ acpi_query_osc (
                 if (osc_dw0 & OSC_INVALID_REVISION_ERROR)
                         printk(KERN_DEBUG "_OSC invalid revision\n"); 
                 if (osc_dw0 & OSC_CAPABILITIES_MASK_ERROR) {
-                        /* Update Global Control Set */
-                        osc_data->global_ctrlsets =
-                                *((u32 *)(out_obj->buffer.pointer + 8));
-                        status = AE_OK;
-                        goto query_osc_out;
+                        if (flags & OSC_QUERY_ENABLE)
+                                goto out_success;
+                        printk(KERN_DEBUG "_OSC FW not grant req. control\n");
+                        status = AE_SUPPORT;
+                        goto out_kfree;
                 }
                 status = AE_ERROR;
-                goto query_osc_out;
+                goto out_kfree;
         }
-
-        /* Update Global Control Set */
-        osc_data->global_ctrlsets = *((u32 *)(out_obj->buffer.pointer + 8));
+out_success:
+        if (flags & OSC_QUERY_ENABLE)
+                osc_args->query_result =
+                        *((u32 *)(out_obj->buffer.pointer + 8));
         status = AE_OK;
 
-query_osc_out:
+out_kfree:
         kfree(output.pointer);
-out_nofree:
-        *ret_status = status;
-
-        osc_data->ctrlset_buf[OSC_QUERY_TYPE] = !OSC_QUERY_ENABLE;
-        osc_data->ctrlset_buf[OSC_CONTROL_TYPE] = temp;
-        if (ACPI_FAILURE(status)) {
-                /* no osc support at all */
-                osc_data->ctrlset_buf[OSC_SUPPORT_TYPE] = 0;
-        }
-
         return status;
 }
 
-
-static acpi_status  
-acpi_run_osc (
-        acpi_handle     handle,
-        void            *context)
+static acpi_status acpi_query_osc(acpi_handle handle,
+                                  u32 level, void *context, void **retval)
 {
-        acpi_status             status;
-        struct acpi_object_list input;
-        union acpi_object       in_params[4];
-        struct acpi_buffer      output = {ACPI_ALLOCATE_BUFFER, NULL};
-        union acpi_object       *out_obj;
-        u32                     osc_dw0;
-
-        /* Setting up input parameters */
-        input.count = 4;
-        input.pointer = in_params;
-        in_params[0].type               = ACPI_TYPE_BUFFER;
-        in_params[0].buffer.length      = 16;
-        in_params[0].buffer.pointer     = OSC_UUID;
-        in_params[1].type               = ACPI_TYPE_INTEGER;
-        in_params[1].integer.value      = 1;
-        in_params[2].type               = ACPI_TYPE_INTEGER;
-        in_params[2].integer.value      = 3;
-        in_params[3].type               = ACPI_TYPE_BUFFER;
-        in_params[3].buffer.length      = 12;
-        in_params[3].buffer.pointer     = (u8 *)context;
+        acpi_status status;
+        struct acpi_osc_data *osc_data;
+        u32 flags = (unsigned long)context, support_set;
+        acpi_handle tmp;
+        struct acpi_osc_args osc_args;
 
-        status = acpi_evaluate_object(handle, "_OSC", &input, &output);
-        if (ACPI_FAILURE (status))
+        status = acpi_get_handle(handle, "_OSC", &tmp);
+        if (ACPI_FAILURE(status))
                 return status;
 
-        out_obj = output.pointer;
-        if (out_obj->type != ACPI_TYPE_BUFFER) {
-                printk(KERN_DEBUG  
-                        "Evaluate _OSC returns wrong type\n");
-                status = AE_TYPE;
-                goto run_osc_out;
+        osc_data = acpi_get_osc_data(handle);
+        if (!osc_data) {
+                printk(KERN_ERR "acpi osc data array is full\n");
+                return AE_ERROR;
         }
-        osc_dw0 = *((u32 *) out_obj->buffer.pointer);
-        if (osc_dw0) {
-                if (osc_dw0 & OSC_REQUEST_ERROR)
-                        printk(KERN_DEBUG "_OSC request fails\n"); 
-                if (osc_dw0 & OSC_INVALID_UUID_ERROR)
-                        printk(KERN_DEBUG "_OSC invalid UUID\n"); 
-                if (osc_dw0 & OSC_INVALID_REVISION_ERROR)
-                        printk(KERN_DEBUG "_OSC invalid revision\n"); 
-                if (osc_dw0 & OSC_CAPABILITIES_MASK_ERROR) {
-                        printk(KERN_DEBUG "_OSC FW not grant req. control\n");
-                        status = AE_SUPPORT;
-                        goto run_osc_out;
-                }
-                status = AE_ERROR;
-                goto run_osc_out;
+
+        /* do _OSC query for all possible controls */
+        support_set = osc_data->support_set | (flags & OSC_SUPPORT_MASKS);
+        osc_args.capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
+        osc_args.capbuf[OSC_SUPPORT_TYPE] = support_set;
+        osc_args.capbuf[OSC_CONTROL_TYPE] = OSC_CONTROL_MASKS;
+
+        status = acpi_run_osc(handle, &osc_args);
+        if (ACPI_SUCCESS(status)) {
+                osc_data->support_set = support_set;
+                osc_data->query_result = osc_args.query_result;
+                osc_data->is_queried = 1;
         }
-        status = AE_OK;
 
-run_osc_out:
-        kfree(output.pointer);
         return status;
 }
 
@@ -215,15 +162,11 @@ run_osc_out:
  **/
 acpi_status __pci_osc_support_set(u32 flags, const char *hid)
 {
-        acpi_status retval = AE_NOT_FOUND;
-
-        if (!(flags & OSC_SUPPORT_MASKS)) {
+        if (!(flags & OSC_SUPPORT_MASKS))
                 return AE_TYPE;
-        }
-        acpi_get_devices(hid,
-                        acpi_query_osc,
-                        (void *)(unsigned long)flags,
-                        (void **) &retval );
+
+        acpi_get_devices(hid, acpi_query_osc,
+                         (void *)(unsigned long)flags, NULL);
         return AE_OK;
 }
 
@@ -236,10 +179,11 @@ acpi_status __pci_osc_support_set(u32 flags, const char *hid)
  **/
 acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
 {
-        acpi_status     status;
-        u32             ctrlset;
+        acpi_status status;
+        u32 ctrlset, control_set;
         acpi_handle tmp;
         struct acpi_osc_data *osc_data;
+        struct acpi_osc_args osc_args;
 
         status = acpi_get_handle(handle, "_OSC", &tmp);
         if (ACPI_FAILURE(status))
@@ -252,19 +196,21 @@ acpi_status pci_osc_control_set(acpi_handle handle, u32 flags)
         }
 
         ctrlset = (flags & OSC_CONTROL_MASKS);
-        if (!ctrlset) {
+        if (!ctrlset)
                 return AE_TYPE;
-        }
-        if (osc_data->ctrlset_buf[OSC_SUPPORT_TYPE] &&
-                ((osc_data->global_ctrlsets & ctrlset) != ctrlset)) {
+
+        if (osc_data->is_queried &&
+            ((osc_data->query_result & ctrlset) != ctrlset))
                 return AE_SUPPORT;
-        }
-        osc_data->ctrlset_buf[OSC_CONTROL_TYPE] |= ctrlset;
-        status = acpi_run_osc(handle, osc_data->ctrlset_buf);
-        if (ACPI_FAILURE (status)) {
-                osc_data->ctrlset_buf[OSC_CONTROL_TYPE] &= ~ctrlset;
-        }
-        
+
+        control_set = osc_data->control_set | ctrlset;
+        osc_args.capbuf[OSC_QUERY_TYPE] = 0;
+        osc_args.capbuf[OSC_SUPPORT_TYPE] = osc_data->support_set;
+        osc_args.capbuf[OSC_CONTROL_TYPE] = control_set;
+        status = acpi_run_osc(handle, &osc_args);
+        if (ACPI_SUCCESS(status))
+                osc_data->control_set = control_set;
+
         return status;
 }
 EXPORT_SYMBOL(pci_osc_control_set);
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 72cf61ed8f96..8eb8a3091dc7 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -274,7 +274,57 @@ static int pci_device_remove(struct device * dev)
         return 0;
 }
 
-static int pci_device_suspend(struct device * dev, pm_message_t state)
+static void pci_device_shutdown(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct pci_driver *drv = pci_dev->driver;
+
+        if (drv && drv->shutdown)
+                drv->shutdown(pci_dev);
+        pci_msi_shutdown(pci_dev);
+        pci_msix_shutdown(pci_dev);
+}
+
+#ifdef CONFIG_PM_SLEEP
+
+/*
+ * Default "suspend" method for devices that have no driver provided suspend,
+ * or not even a driver at all.
+ */
+static void pci_default_pm_suspend(struct pci_dev *pci_dev)
+{
+        pci_save_state(pci_dev);
+        /*
+         * mark its power state as "unknown", since we don't know if
+         * e.g. the BIOS will change its device state when we suspend.
+         */
+        if (pci_dev->current_state == PCI_D0)
+                pci_dev->current_state = PCI_UNKNOWN;
+}
+
+/*
+ * Default "resume" method for devices that have no driver provided resume,
+ * or not even a driver at all.
+ */
+static int pci_default_pm_resume(struct pci_dev *pci_dev)
+{
+        int retval = 0;
+
+        /* restore the PCI config space */
+        pci_restore_state(pci_dev);
+        /* if the device was enabled before suspend, reenable */
+        retval = pci_reenable_device(pci_dev);
+        /*
+         * if the device was busmaster before the suspend, make it busmaster
+         * again
+         */
+        if (pci_dev->is_busmaster)
+                pci_set_master(pci_dev);
+
+        return retval;
+}
+
+static int pci_legacy_suspend(struct device *dev, pm_message_t state)
 {
         struct pci_dev * pci_dev = to_pci_dev(dev);
         struct pci_driver * drv = pci_dev->driver;
@@ -284,18 +334,12 @@ static int pci_device_suspend(struct device * dev, pm_message_t state)
                 i = drv->suspend(pci_dev, state);
                 suspend_report_result(drv->suspend, i);
         } else {
-                pci_save_state(pci_dev);
-                /*
-                 * mark its power state as "unknown", since we don't know if
-                 * e.g. the BIOS will change its device state when we suspend.
-                 */
-                if (pci_dev->current_state == PCI_D0)
-                        pci_dev->current_state = PCI_UNKNOWN;
+                pci_default_pm_suspend(pci_dev);
         }
         return i;
 }
 
-static int pci_device_suspend_late(struct device * dev, pm_message_t state)
+static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
 {
         struct pci_dev * pci_dev = to_pci_dev(dev);
         struct pci_driver * drv = pci_dev->driver;
@@ -308,26 +352,7 @@ static int pci_device_suspend_late(struct device * dev, pm_message_t state)
         return i;
 }
 
-/*
- * Default resume method for devices that have no driver provided resume,
- * or not even a driver at all.
- */
-static int pci_default_resume(struct pci_dev *pci_dev)
-{
-        int retval = 0;
-
-        /* restore the PCI config space */
-        pci_restore_state(pci_dev);
-        /* if the device was enabled before suspend, reenable */
-        retval = pci_reenable_device(pci_dev);
-        /* if the device was busmaster before the suspend, make it busmaster again */
-        if (pci_dev->is_busmaster)
-                pci_set_master(pci_dev);
-
-        return retval;
-}
-
-static int pci_device_resume(struct device * dev)
+static int pci_legacy_resume(struct device *dev)
 {
         int error;
         struct pci_dev * pci_dev = to_pci_dev(dev);
@@ -336,34 +361,313 @@ static int pci_device_resume(struct device * dev)
         if (drv && drv->resume)
                 error = drv->resume(pci_dev);
         else
-                error = pci_default_resume(pci_dev);
+                error = pci_default_pm_resume(pci_dev);
         return error;
 }
 
-static int pci_device_resume_early(struct device * dev)
+static int pci_legacy_resume_early(struct device *dev)
 {
         int error = 0;
         struct pci_dev * pci_dev = to_pci_dev(dev);
         struct pci_driver * drv = pci_dev->driver;
 
-        pci_fixup_device(pci_fixup_resume, pci_dev);
-
         if (drv && drv->resume_early)
                 error = drv->resume_early(pci_dev);
         return error;
 }
 
-static void pci_device_shutdown(struct device *dev)
+static int pci_pm_prepare(struct device *dev)
+{
+        struct device_driver *drv = dev->driver;
+        int error = 0;
+
+        if (drv && drv->pm && drv->pm->prepare)
+                error = drv->pm->prepare(dev);
+
+        return error;
+}
+
+static void pci_pm_complete(struct device *dev)
+{
+        struct device_driver *drv = dev->driver;
+
+        if (drv && drv->pm && drv->pm->complete)
+                drv->pm->complete(dev);
+}
+
+#ifdef CONFIG_SUSPEND
+
+static int pci_pm_suspend(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct device_driver *drv = dev->driver;
+        int error = 0;
+
+        if (drv && drv->pm) {
+                if (drv->pm->suspend) {
+                        error = drv->pm->suspend(dev);
+                        suspend_report_result(drv->pm->suspend, error);
+                } else {
+                        pci_default_pm_suspend(pci_dev);
+                }
+        } else {
+                error = pci_legacy_suspend(dev, PMSG_SUSPEND);
+        }
+        pci_fixup_device(pci_fixup_suspend, pci_dev);
+
+        return error;
+}
+
+static int pci_pm_suspend_noirq(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
         struct pci_driver *drv = pci_dev->driver;
+        int error = 0;
 
-        if (drv && drv->shutdown)
-                drv->shutdown(pci_dev);
-        pci_msi_shutdown(pci_dev);
-        pci_msix_shutdown(pci_dev);
+        if (drv && drv->pm) {
+                if (drv->pm->suspend_noirq) {
+                        error = drv->pm->suspend_noirq(dev);
+                        suspend_report_result(drv->pm->suspend_noirq, error);
+                }
+        } else {
+                error = pci_legacy_suspend_late(dev, PMSG_SUSPEND);
+        }
+
+        return error;
 }
 
+static int pci_pm_resume(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct device_driver *drv = dev->driver;
+        int error;
+
+        pci_fixup_device(pci_fixup_resume, pci_dev);
+
+        if (drv && drv->pm) {
+                error = drv->pm->resume ? drv->pm->resume(dev) :
+                        pci_default_pm_resume(pci_dev);
+        } else {
+                error = pci_legacy_resume(dev);
+        }
+
+        return error;
+}
+
+static int pci_pm_resume_noirq(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct pci_driver *drv = pci_dev->driver;
+        int error = 0;
+
+        pci_fixup_device(pci_fixup_resume_early, pci_dev);
+
+        if (drv && drv->pm) {
+                if (drv->pm->resume_noirq)
+                        error = drv->pm->resume_noirq(dev);
+        } else {
+                error = pci_legacy_resume_early(dev);
+        }
+
+        return error;
+}
+
+#else /* !CONFIG_SUSPEND */
+
+#define pci_pm_suspend          NULL
+#define pci_pm_suspend_noirq    NULL
+#define pci_pm_resume           NULL
+#define pci_pm_resume_noirq     NULL
+
+#endif /* !CONFIG_SUSPEND */
+
+#ifdef CONFIG_HIBERNATION
+
+static int pci_pm_freeze(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct device_driver *drv = dev->driver;
+        int error = 0;
+
+        if (drv && drv->pm) {
+                if (drv->pm->freeze) {
+                        error = drv->pm->freeze(dev);
+                        suspend_report_result(drv->pm->freeze, error);
+                } else {
+                        pci_default_pm_suspend(pci_dev);
+                }
+        } else {
+                error = pci_legacy_suspend(dev, PMSG_FREEZE);
+                pci_fixup_device(pci_fixup_suspend, pci_dev);
+        }
+
+        return error;
+}
+
+static int pci_pm_freeze_noirq(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct pci_driver *drv = pci_dev->driver;
+        int error = 0;
+
+        if (drv && drv->pm) {
+                if (drv->pm->freeze_noirq) {
+                        error = drv->pm->freeze_noirq(dev);
+                        suspend_report_result(drv->pm->freeze_noirq, error);
+                }
+        } else {
+                error = pci_legacy_suspend_late(dev, PMSG_FREEZE);
+        }
+
+        return error;
+}
+
+static int pci_pm_thaw(struct device *dev)
+{
+        struct device_driver *drv = dev->driver;
+        int error = 0;
+
+        if (drv && drv->pm) {
+                if (drv->pm->thaw)
+                        error =  drv->pm->thaw(dev);
+        } else {
+                pci_fixup_device(pci_fixup_resume, to_pci_dev(dev));
+                error = pci_legacy_resume(dev);
+        }
+
+        return error;
+}
+
+static int pci_pm_thaw_noirq(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct pci_driver *drv = pci_dev->driver;
+        int error = 0;
+
+        if (drv && drv->pm) {
+                if (drv->pm->thaw_noirq)
+                        error = drv->pm->thaw_noirq(dev);
+        } else {
+                pci_fixup_device(pci_fixup_resume_early, pci_dev);
+                error = pci_legacy_resume_early(dev);
+        }
+
+        return error;
+}
+
+static int pci_pm_poweroff(struct device *dev)
+{
+        struct device_driver *drv = dev->driver;
+        int error = 0;
+
+        pci_fixup_device(pci_fixup_suspend, to_pci_dev(dev));
+
+        if (drv && drv->pm) {
+                if (drv->pm->poweroff) {
+                        error = drv->pm->poweroff(dev);
+                        suspend_report_result(drv->pm->poweroff, error);
+                }
+        } else {
+                error = pci_legacy_suspend(dev, PMSG_HIBERNATE);
+        }
+
+        return error;
+}
+
+static int pci_pm_poweroff_noirq(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct pci_driver *drv = pci_dev->driver;
+        int error = 0;
+
+        if (drv && drv->pm) {
+                if (drv->pm->poweroff_noirq) {
+                        error = drv->pm->poweroff_noirq(dev);
+                        suspend_report_result(drv->pm->poweroff_noirq, error);
+                }
+        } else {
+                error = pci_legacy_suspend_late(dev, PMSG_HIBERNATE);
+        }
+
+        return error;
+}
+
+static int pci_pm_restore(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct device_driver *drv = dev->driver;
+        int error;
+
+        if (drv && drv->pm) {
+                error = drv->pm->restore ? drv->pm->restore(dev) :
+                        pci_default_pm_resume(pci_dev);
+        } else {
+                error = pci_legacy_resume(dev);
+        }
+        pci_fixup_device(pci_fixup_resume, pci_dev);
+
+        return error;
+}
+
+static int pci_pm_restore_noirq(struct device *dev)
+{
+        struct pci_dev *pci_dev = to_pci_dev(dev);
+        struct pci_driver *drv = pci_dev->driver;
+        int error = 0;
+
+        pci_fixup_device(pci_fixup_resume, pci_dev);
+
+        if (drv && drv->pm) {
+                if (drv->pm->restore_noirq)
+                        error = drv->pm->restore_noirq(dev);
+        } else {
+                error = pci_legacy_resume_early(dev);
+        }
+        pci_fixup_device(pci_fixup_resume_early, pci_dev);
+
+        return error;
+}
+
+#else /* !CONFIG_HIBERNATION */
+
+#define pci_pm_freeze           NULL
+#define pci_pm_freeze_noirq     NULL
+#define pci_pm_thaw             NULL
+#define pci_pm_thaw_noirq       NULL
+#define pci_pm_poweroff         NULL
+#define pci_pm_poweroff_noirq   NULL
+#define pci_pm_restore          NULL
+#define pci_pm_restore_noirq    NULL
+
+#endif /* !CONFIG_HIBERNATION */
+
+struct pm_ext_ops pci_pm_ops = {
+        .base = {
+                .prepare = pci_pm_prepare,
+                .complete = pci_pm_complete,
+                .suspend = pci_pm_suspend,
+                .resume = pci_pm_resume,
+                .freeze = pci_pm_freeze,
+                .thaw = pci_pm_thaw,
+                .poweroff = pci_pm_poweroff,
+                .restore = pci_pm_restore,
+        },
+        .suspend_noirq = pci_pm_suspend_noirq,
+        .resume_noirq = pci_pm_resume_noirq,
+        .freeze_noirq = pci_pm_freeze_noirq,
+        .thaw_noirq = pci_pm_thaw_noirq,
+        .poweroff_noirq = pci_pm_poweroff_noirq,
+        .restore_noirq = pci_pm_restore_noirq,
+};
+
+#define PCI_PM_OPS_PTR  &pci_pm_ops
+
+#else /* !CONFIG_PM_SLEEP */
+
+#define PCI_PM_OPS_PTR  NULL
+
+#endif /* !CONFIG_PM_SLEEP */
+
 /**
  * __pci_register_driver - register a new pci driver
  * @drv: the driver structure to register
@@ -386,6 +690,9 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
         drv->driver.owner = owner;
         drv->driver.mod_name = mod_name;
 
+        if (drv->pm)
+                drv->driver.pm = &drv->pm->base;
+
         spin_lock_init(&drv->dynids.lock);
         INIT_LIST_HEAD(&drv->dynids.list);
 
@@ -511,12 +818,9 @@ struct bus_type pci_bus_type = {
         .uevent         = pci_uevent,
         .probe          = pci_device_probe,
         .remove         = pci_device_remove,
-        .suspend        = pci_device_suspend,
-        .suspend_late   = pci_device_suspend_late,
-        .resume_early   = pci_device_resume_early,
-        .resume         = pci_device_resume,
         .shutdown       = pci_device_shutdown,
         .dev_attrs      = pci_dev_attrs,
+        .pm             = PCI_PM_OPS_PTR,
 };
 
 static int __init pci_driver_init(void)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 75c60239cadd..7869f8f75c9e 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1,6 +1,4 @@
 /*
- *      $Id: pci.c,v 1.91 1999/01/21 13:34:01 davem Exp $
- *
  *      PCI Bus Services, see include/linux/pci.h for further explanation.
  *
  *      Copyright 1993 -- 1997 Drew Eckhardt, Frederic Potter,
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index ff30b3c91aad..e0eff35825a6 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -105,3 +105,16 @@ pci_match_one_device(const struct pci_device_id *id, const struct pci_dev *dev)
 }
 
 struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev);
+
+/* PCI slot sysfs helper code */
+#define to_pci_slot(s) container_of(s, struct pci_slot, kobj)
+
+extern struct kset *pci_slots_kset;
+
+struct pci_slot_attribute {
+        struct attribute attr;
+        ssize_t (*show)(struct pci_slot *, char *);
+        ssize_t (*store)(struct pci_slot *, const char *, size_t);
+};
+#define to_pci_slot_attr(s) container_of(s, struct pci_slot_attribute, attr)
+
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index 07c3bdb6edc2..b7a3aa602d40 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -26,6 +26,7 @@
 #include <linux/pcieport_if.h>
 
 #include "aerdrv.h"
+#include "../../pci.h"
 
 /*
  * Version Information
diff --git a/drivers/pci/pcie/portdrv_bus.c b/drivers/pci/pcie/portdrv_bus.c
index 3f0976868eda..359fe5568df1 100644
--- a/drivers/pci/pcie/portdrv_bus.c
+++ b/drivers/pci/pcie/portdrv_bus.c
@@ -13,6 +13,7 @@
 #include <linux/pm.h>
 
 #include <linux/pcieport_if.h>
+#include "portdrv.h"
 
 static int pcie_port_bus_match(struct device *dev, struct device_driver *drv);
 static int pcie_port_bus_suspend(struct device *dev, pm_message_t state);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 3706ce7972dd..4562827b7e22 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -414,6 +414,7 @@ static struct pci_bus * pci_alloc_bus(void)
                 INIT_LIST_HEAD(&b->node);
                 INIT_LIST_HEAD(&b->children);
                 INIT_LIST_HEAD(&b->devices);
+                INIT_LIST_HEAD(&b->slots);
         }
         return b;
 }
@@ -857,6 +858,49 @@ int pci_cfg_space_size_ext(struct pci_dev *dev)
         return PCI_CFG_SPACE_SIZE;
 }
 
+/**
+ * pci_disable_pme - Disable the PME function of PCI device
+ * @dev: PCI device affected
+ * -EINVAL is returned if PCI device doesn't support PME.
+ * Zero is returned if the PME is supported and can be disabled.
+ */
+static int pci_disable_pme(struct pci_dev *dev)
+{
+        int pm;
+        u16 value;
+
+        /* find PCI PM capability in list */
+        pm = pci_find_capability(dev, PCI_CAP_ID_PM);
+
+        /* If device doesn't support PM Capabilities, it means that PME is
+         * not supported.
+         */
+        if (!pm)
+                return -EINVAL;
+        /* Check device's ability to generate PME# */
+        pci_read_config_word(dev, pm + PCI_PM_PMC, &value);
+
+        value &= PCI_PM_CAP_PME_MASK;
+        /* Check if it can generate PME# */
+        if (!value) {
+                /*
+                 * If it is zero, it means that PME is still unsupported
+                 * although there exists the PM capability.
+                 */
+                return -EINVAL;
+        }
+
+        pci_read_config_word(dev, pm + PCI_PM_CTRL, &value);
+
+        /* Clear PME_Status by writing 1 to it */
+        value |= PCI_PM_CTRL_PME_STATUS ;
+        /* Disable PME enable bit */
+        value &= ~PCI_PM_CTRL_PME_ENABLE;
+        pci_write_config_word(dev, pm + PCI_PM_CTRL, value);
+
+        return 0;
+}
+
 int pci_cfg_space_size(struct pci_dev *dev)
 {
         int pos;
@@ -964,6 +1008,7 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
         }
 
         pci_vpd_pci22_init(dev);
+        pci_disable_pme(dev);
 
         return dev;
 }
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 963a97642ae9..4400dffbd93a 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -1,6 +1,4 @@
 /*
- *      $Id: proc.c,v 1.13 1998/05/12 07:36:07 mj Exp $
- *
  *      Procfs interface for the PCI bus.
  *
  *      Copyright (c) 1997--1999 Martin Mares <mj@ucw.cz>
@@ -482,5 +480,5 @@ static int __init pci_proc_init(void)
         return 0;
 }
 
-__initcall(pci_proc_init);
+device_initcall(pci_proc_init);
 
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index dabb563f51d9..92b52ebd0eb6 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -556,7 +556,7 @@ static void quirk_via_ioapic(struct pci_dev *dev)
         pci_write_config_byte (dev, 0x58, tmp);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_VIA,       PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic);
 
 /*
  * VIA 8237: Some BIOSs don't set the 'Bypass APIC De-Assert Message' Bit.
@@ -576,7 +576,7 @@ static void quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_VIA,       PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
 
 /*
  * The AMD io apic can hang the box when an apic irq is masked.
@@ -622,7 +622,7 @@ static void quirk_amd_8131_ioapic(struct pci_dev *dev)
         }
 } 
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
 #endif /* CONFIG_X86_IO_APIC */
 
 /*
@@ -774,7 +774,7 @@ static void quirk_cardbus_legacy(struct pci_dev *dev)
         pci_write_config_dword(dev, PCI_CB_LEGACY_MODE_BASE, 0);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
-DECLARE_PCI_FIXUP_RESUME(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
 
 /*
  * Following the PCI ordering rules is optional on the AMD762. I'm not
@@ -797,7 +797,7 @@ static void quirk_amd_ordering(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,      PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD,     PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_AMD,       PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering);
 
 /*
  *      DreamWorks provided workaround for Dunord I-3000 problem
@@ -865,7 +865,7 @@ static void quirk_disable_pxb(struct pci_dev *pdev)
         }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,     PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb);
 
 static void __devinit quirk_amd_ide_mode(struct pci_dev *pdev)
 {
@@ -885,9 +885,9 @@ static void __devinit quirk_amd_ide_mode(struct pci_dev *pdev)
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_amd_ide_mode);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_amd_ide_mode);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP700_SATA, quirk_amd_ide_mode);
 
 /*
  *      Serverworks CSB5 IDE does not fully support native mode
@@ -1054,6 +1054,20 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                                  * its on-board VGA controller */
                                 asus_hides_smbus = 1;
                         }
+                else if (dev->device == PCI_DEVICE_ID_INTEL_82845G_IG)
+                        switch(dev->subsystem_device) {
+                        case 0x00b8: /* Compaq Evo D510 CMT */
+                        case 0x00b9: /* Compaq Evo D510 SFF */
+                                asus_hides_smbus = 1;
+                        }
+                else if (dev->device == PCI_DEVICE_ID_INTEL_82815_CGC)
+                        switch (dev->subsystem_device) {
+                        case 0x001A: /* Compaq Deskpro EN SSF P667 815E */
+                                /* Motherboard doesn't have host bridge
+                                 * subvendor/subdevice IDs, therefore checking
+                                 * its on-board VGA controller */
+                                asus_hides_smbus = 1;
+                        }
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82845_HB,   asus_hides_smbus_hostbridge);
@@ -1068,6 +1082,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82855GM_HB,	as
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge);
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82810_IG3,  asus_hides_smbus_hostbridge);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82845G_IG,  asus_hides_smbus_hostbridge);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82815_CGC,  asus_hides_smbus_hostbridge);
 
 static void asus_hides_smbus_lpc(struct pci_dev *dev)
 {
@@ -1093,31 +1109,61 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801CA_0,	asu
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801AA_0,  asus_hides_smbus_lpc);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_0,  asus_hides_smbus_lpc);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801BA_0,  asus_hides_smbus_lpc);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_0,  asus_hides_smbus_lpc);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,     PCI_DEVICE_ID_INTEL_82801AA_0,  asus_hides_smbus_lpc);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,     PCI_DEVICE_ID_INTEL_82801DB_0,  asus_hides_smbus_lpc);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,     PCI_DEVICE_ID_INTEL_82801BA_0,  asus_hides_smbus_lpc);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,     PCI_DEVICE_ID_INTEL_82801CA_0,  asus_hides_smbus_lpc);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,     PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,     PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,     PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc);
 
-static void asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
+/* It appears we just have one such device. If not, we have a warning */
+static void __iomem *asus_rcba_base;
+static void asus_hides_smbus_lpc_ich6_suspend(struct pci_dev *dev)
 {
-        u32 val, rcba;
-        void __iomem *base;
+        u32 rcba;
 
         if (likely(!asus_hides_smbus))
                 return;
+        WARN_ON(asus_rcba_base);
+
         pci_read_config_dword(dev, 0xF0, &rcba);
-        base = ioremap_nocache(rcba & 0xFFFFC000, 0x4000); /* use bits 31:14, 16 kB aligned */
-        if (base == NULL) return;
-        val=readl(base + 0x3418); /* read the Function Disable register, dword mode only */
-        writel(val & 0xFFFFFFF7, base + 0x3418); /* enable the SMBus device */
-        iounmap(base);
+        /* use bits 31:14, 16 kB aligned */
+        asus_rcba_base = ioremap_nocache(rcba & 0xFFFFC000, 0x4000);
+        if (asus_rcba_base == NULL)
+                return;
+}
+
+static void asus_hides_smbus_lpc_ich6_resume_early(struct pci_dev *dev)
+{
+        u32 val;
+
+        if (likely(!asus_hides_smbus || !asus_rcba_base))
+                return;
+        /* read the Function Disable register, dword mode only */
+        val = readl(asus_rcba_base + 0x3418);
+        writel(val & 0xFFFFFFF7, asus_rcba_base + 0x3418); /* enable the SMBus device */
+}
+
+static void asus_hides_smbus_lpc_ich6_resume(struct pci_dev *dev)
+{
+        if (likely(!asus_hides_smbus || !asus_rcba_base))
+                return;
+        iounmap(asus_rcba_base);
+        asus_rcba_base = NULL;
         dev_info(&dev->dev, "Enabled ICH6/i801 SMBus device\n");
 }
+
+static void asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
+{
+        asus_hides_smbus_lpc_ich6_suspend(dev);
+        asus_hides_smbus_lpc_ich6_resume_early(dev);
+        asus_hides_smbus_lpc_ich6_resume(dev);
+}
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc_ich6);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc_ich6);
+DECLARE_PCI_FIXUP_SUSPEND(PCI_VENDOR_ID_INTEL,  PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc_ich6_suspend);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc_ich6_resume);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,     PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc_ich6_resume_early);
 
 /*
  * SiS 96x south bridge: BIOS typically hides SMBus device...
@@ -1135,10 +1181,10 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_961,		quirk_sis_96x_
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_962,           quirk_sis_96x_smbus);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_963,           quirk_sis_96x_smbus);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_LPC,           quirk_sis_96x_smbus);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_961,           quirk_sis_96x_smbus);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_962,           quirk_sis_96x_smbus);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_963,           quirk_sis_96x_smbus);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_LPC,           quirk_sis_96x_smbus);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_SI,        PCI_DEVICE_ID_SI_961,           quirk_sis_96x_smbus);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_SI,        PCI_DEVICE_ID_SI_962,           quirk_sis_96x_smbus);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_SI,        PCI_DEVICE_ID_SI_963,           quirk_sis_96x_smbus);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_SI,        PCI_DEVICE_ID_SI_LPC,           quirk_sis_96x_smbus);
 
 /*
  * ... This is further complicated by the fact that some SiS96x south
@@ -1172,7 +1218,7 @@ static void quirk_sis_503(struct pci_dev *dev)
         quirk_sis_96x_smbus(dev);
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_503,           quirk_sis_503);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_503,           quirk_sis_503);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_SI,        PCI_DEVICE_ID_SI_503,           quirk_sis_503);
 
 
 /*
@@ -1205,7 +1251,7 @@ static void asus_hides_ac97_lpc(struct pci_dev *dev)
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8237, asus_hides_ac97_lpc);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8237, asus_hides_ac97_lpc);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_VIA,       PCI_DEVICE_ID_VIA_8237, asus_hides_ac97_lpc);
 
 #if defined(CONFIG_ATA) || defined(CONFIG_ATA_MODULE)
 
@@ -1270,12 +1316,12 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, qui
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, quirk_jmicron_ata);
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, quirk_jmicron_ata);
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368, quirk_jmicron_ata);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB360, quirk_jmicron_ata);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, quirk_jmicron_ata);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, quirk_jmicron_ata);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, quirk_jmicron_ata);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, quirk_jmicron_ata);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368, quirk_jmicron_ata);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB360, quirk_jmicron_ata);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, quirk_jmicron_ata);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, quirk_jmicron_ata);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, quirk_jmicron_ata);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, quirk_jmicron_ata);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368, quirk_jmicron_ata);
 
 #endif
 
@@ -1521,6 +1567,10 @@ extern struct pci_fixup __start_pci_fixups_enable[];
 extern struct pci_fixup __end_pci_fixups_enable[];
 extern struct pci_fixup __start_pci_fixups_resume[];
 extern struct pci_fixup __end_pci_fixups_resume[];
+extern struct pci_fixup __start_pci_fixups_resume_early[];
+extern struct pci_fixup __end_pci_fixups_resume_early[];
+extern struct pci_fixup __start_pci_fixups_suspend[];
+extern struct pci_fixup __end_pci_fixups_suspend[];
 
 
 void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
@@ -1553,6 +1603,16 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
                 end = __end_pci_fixups_resume;
                 break;
 
+        case pci_fixup_resume_early:
+                start = __start_pci_fixups_resume_early;
+                end = __end_pci_fixups_resume_early;
+                break;
+
+        case pci_fixup_suspend:
+                start = __start_pci_fixups_suspend;
+                end = __end_pci_fixups_suspend;
+                break;
+
         default:
                 /* stupid compiler warning, you would think with an enum... */
                 return;
@@ -1629,7 +1689,7 @@ static void quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
                         quirk_nvidia_ck804_pcie_aer_ext_cap);
-DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
                         quirk_nvidia_ck804_pcie_aer_ext_cap);
 
 static void __devinit quirk_via_cx700_pci_parking_caching(struct pci_dev *dev)
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
new file mode 100644
index 000000000000..7e5b85cbd948
--- /dev/null
+++ b/drivers/pci/slot.c
@@ -0,0 +1,233 @@
+/*
+ * drivers/pci/slot.c
+ * Copyright (C) 2006 Matthew Wilcox <matthew@wil.cx>
+ * Copyright (C) 2006-2008 Hewlett-Packard Development Company, L.P.
+ *      Alex Chiang <achiang@hp.com>
+ */
+
+#include <linux/kobject.h>
+#include <linux/pci.h>
+#include <linux/err.h>
+#include "pci.h"
+
+struct kset *pci_slots_kset;
+EXPORT_SYMBOL_GPL(pci_slots_kset);
+
+static ssize_t pci_slot_attr_show(struct kobject *kobj,
+                                        struct attribute *attr, char *buf)
+{
+        struct pci_slot *slot = to_pci_slot(kobj);
+        struct pci_slot_attribute *attribute = to_pci_slot_attr(attr);
+        return attribute->show ? attribute->show(slot, buf) : -EIO;
+}
+
+static ssize_t pci_slot_attr_store(struct kobject *kobj,
+                        struct attribute *attr, const char *buf, size_t len)
+{
+        struct pci_slot *slot = to_pci_slot(kobj);
+        struct pci_slot_attribute *attribute = to_pci_slot_attr(attr);
+        return attribute->store ? attribute->store(slot, buf, len) : -EIO;
+}
+
+static struct sysfs_ops pci_slot_sysfs_ops = {
+        .show = pci_slot_attr_show,
+        .store = pci_slot_attr_store,
+};
+
+static ssize_t address_read_file(struct pci_slot *slot, char *buf)
+{
+        if (slot->number == 0xff)
+                return sprintf(buf, "%04x:%02x\n",
+                                pci_domain_nr(slot->bus),
+                                slot->bus->number);
+        else
+                return sprintf(buf, "%04x:%02x:%02x\n",
+                                pci_domain_nr(slot->bus),
+                                slot->bus->number,
+                                slot->number);
+}
+
+static void pci_slot_release(struct kobject *kobj)
+{
+        struct pci_slot *slot = to_pci_slot(kobj);
+
+        pr_debug("%s: releasing pci_slot on %x:%d\n", __func__,
+                 slot->bus->number, slot->number);
+
+        list_del(&slot->list);
+
+        kfree(slot);
+}
+
+static struct pci_slot_attribute pci_slot_attr_address =
+        __ATTR(address, (S_IFREG | S_IRUGO), address_read_file, NULL);
+
+static struct attribute *pci_slot_default_attrs[] = {
+        &pci_slot_attr_address.attr,
+        NULL,
+};
+
+static struct kobj_type pci_slot_ktype = {
+        .sysfs_ops = &pci_slot_sysfs_ops,
+        .release = &pci_slot_release,
+        .default_attrs = pci_slot_default_attrs,
+};
+
+/**
+ * pci_create_slot - create or increment refcount for physical PCI slot
+ * @parent: struct pci_bus of parent bridge
+ * @slot_nr: PCI_SLOT(pci_dev->devfn) or -1 for placeholder
+ * @name: user visible string presented in /sys/bus/pci/slots/<name>
+ *
+ * PCI slots have first class attributes such as address, speed, width,
+ * and a &struct pci_slot is used to manage them. This interface will
+ * either return a new &struct pci_slot to the caller, or if the pci_slot
+ * already exists, its refcount will be incremented.
+ *
+ * Slots are uniquely identified by a @pci_bus, @slot_nr, @name tuple.
+ *
+ * Placeholder slots:
+ * In most cases, @pci_bus, @slot_nr will be sufficient to uniquely identify
+ * a slot. There is one notable exception - pSeries (rpaphp), where the
+ * @slot_nr cannot be determined until a device is actually inserted into
+ * the slot. In this scenario, the caller may pass -1 for @slot_nr.
+ *
+ * The following semantics are imposed when the caller passes @slot_nr ==
+ * -1. First, the check for existing %struct pci_slot is skipped, as the
+ * caller may know about several unpopulated slots on a given %struct
+ * pci_bus, and each slot would have a @slot_nr of -1.  Uniqueness for
+ * these slots is then determined by the @name parameter. We expect
+ * kobject_init_and_add() to warn us if the caller attempts to create
+ * multiple slots with the same name. The other change in semantics is
+ * user-visible, which is the 'address' parameter presented in sysfs will
+ * consist solely of a dddd:bb tuple, where dddd is the PCI domain of the
+ * %struct pci_bus and bb is the bus number. In other words, the devfn of
+ * the 'placeholder' slot will not be displayed.
+ */
+
+struct pci_slot *pci_create_slot(struct pci_bus *parent, int slot_nr,
+                                 const char *name)
+{
+        struct pci_slot *slot;
+        int err;
+
+        down_write(&pci_bus_sem);
+
+        if (slot_nr == -1)
+                goto placeholder;
+
+        /* If we've already created this slot, bump refcount and return. */
+        list_for_each_entry(slot, &parent->slots, list) {
+                if (slot->number == slot_nr) {
+                        kobject_get(&slot->kobj);
+                        pr_debug("%s: inc refcount to %d on %04x:%02x:%02x\n",
+                                 __func__,
+                                 atomic_read(&slot->kobj.kref.refcount),
+                                 pci_domain_nr(parent), parent->number,
+                                 slot_nr);
+                        goto out;
+                }
+        }
+
+placeholder:
+        slot = kzalloc(sizeof(*slot), GFP_KERNEL);
+        if (!slot) {
+                slot = ERR_PTR(-ENOMEM);
+                goto out;
+        }
+
+        slot->bus = parent;
+        slot->number = slot_nr;
+
+        slot->kobj.kset = pci_slots_kset;
+        err = kobject_init_and_add(&slot->kobj, &pci_slot_ktype, NULL,
+                                   "%s", name);
+        if (err) {
+                printk(KERN_ERR "Unable to register kobject %s\n", name);
+                goto err;
+        }
+
+        INIT_LIST_HEAD(&slot->list);
+        list_add(&slot->list, &parent->slots);
+
+        /* Don't care if debug printk has a -1 for slot_nr */
+        pr_debug("%s: created pci_slot on %04x:%02x:%02x\n",
+                 __func__, pci_domain_nr(parent), parent->number, slot_nr);
+
+ out:
+        up_write(&pci_bus_sem);
+        return slot;
+ err:
+        kfree(slot);
+        slot = ERR_PTR(err);
+        goto out;
+}
+EXPORT_SYMBOL_GPL(pci_create_slot);
+
+/**
+ * pci_update_slot_number - update %struct pci_slot -> number
+ * @slot - %struct pci_slot to update
+ * @slot_nr - new number for slot
+ *
+ * The primary purpose of this interface is to allow callers who earlier
+ * created a placeholder slot in pci_create_slot() by passing a -1 as
+ * slot_nr, to update their %struct pci_slot with the correct @slot_nr.
+ */
+
+void pci_update_slot_number(struct pci_slot *slot, int slot_nr)
+{
+        int name_count = 0;
+        struct pci_slot *tmp;
+
+        down_write(&pci_bus_sem);
+
+        list_for_each_entry(tmp, &slot->bus->slots, list) {
+                WARN_ON(tmp->number == slot_nr);
+                if (!strcmp(kobject_name(&tmp->kobj), kobject_name(&slot->kobj)))
+                        name_count++;
+        }
+
+        if (name_count > 1)
+                printk(KERN_WARNING "pci_update_slot_number found %d slots with the same name: %s\n", name_count, kobject_name(&slot->kobj));
+
+        slot->number = slot_nr;
+        up_write(&pci_bus_sem);
+}
+EXPORT_SYMBOL_GPL(pci_update_slot_number);
+
+/**
+ * pci_destroy_slot - decrement refcount for physical PCI slot
+ * @slot: struct pci_slot to decrement
+ *
+ * %struct pci_slot is refcounted, so destroying them is really easy; we
+ * just call kobject_put on its kobj and let our release methods do the
+ * rest.
+ */
+
+void pci_destroy_slot(struct pci_slot *slot)
+{
+        pr_debug("%s: dec refcount to %d on %04x:%02x:%02x\n", __func__,
+                 atomic_read(&slot->kobj.kref.refcount) - 1,
+                 pci_domain_nr(slot->bus), slot->bus->number, slot->number);
+
+        down_write(&pci_bus_sem);
+        kobject_put(&slot->kobj);
+        up_write(&pci_bus_sem);
+}
+EXPORT_SYMBOL_GPL(pci_destroy_slot);
+
+static int pci_slot_init(void)
+{
+        struct kset *pci_bus_kset;
+
+        pci_bus_kset = bus_get_kset(&pci_bus_type);
+        pci_slots_kset = kset_create_and_add("slots", NULL,
+                                                &pci_bus_kset->kobj);
+        if (!pci_slots_kset) {
+                printk(KERN_ERR "PCI: Slot initialization failure\n");
+                return -ENOMEM;
+        }
+        return 0;
+}
+
+subsys_initcall(pci_slot_init);