Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6] / drivers / pci / hotplug / pciehp_core.c
index f93e81e..c248554 100644 (file)
 #include <linux/pci.h>
 #include "pciehp.h"
 #include <linux/interrupt.h>
+#include <linux/time.h>
 
 /* Global variables */
 int pciehp_debug;
 int pciehp_poll_mode;
 int pciehp_poll_time;
 int pciehp_force;
-struct controller *pciehp_ctrl_list;
+struct workqueue_struct *pciehp_wq;
 
 #define DRIVER_VERSION "0.4"
 #define DRIVER_AUTHOR  "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
@@ -61,7 +62,6 @@ MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if _OSC and OSHP are missing"
 
 #define PCIE_MODULE_NAME "pciehp"
 
-static int pcie_start_thread (void);
 static int set_attention_status (struct hotplug_slot *slot, u8 value);
 static int enable_slot         (struct hotplug_slot *slot);
 static int disable_slot                (struct hotplug_slot *slot);
@@ -69,7 +69,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);
 
@@ -82,11 +81,103 @@ 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,
 };
 
+/*
+ * Check the status of the Electro Mechanical Interlock (EMI)
+ */
+static int get_lock_status(struct hotplug_slot *hotplug_slot, u8 *value)
+{
+       struct slot *slot = hotplug_slot->private;
+       return (slot->hpc_ops->get_emi_status(slot, value));
+}
+
+/*
+ * sysfs interface for the Electro Mechanical Interlock (EMI)
+ * 1 == locked, 0 == unlocked
+ */
+static ssize_t lock_read_file(struct hotplug_slot *slot, char *buf)
+{
+       int retval;
+       u8 value;
+
+       retval = get_lock_status(slot, &value);
+       if (retval)
+               goto lock_read_exit;
+       retval = sprintf (buf, "%d\n", value);
+
+lock_read_exit:
+       return retval;
+}
+
+/*
+ * Change the status of the Electro Mechanical Interlock (EMI)
+ * This is a toggle - in addition there must be at least 1 second
+ * in between toggles.
+ */
+static int set_lock_status(struct hotplug_slot *hotplug_slot, u8 status)
+{
+       struct slot *slot = hotplug_slot->private;
+       int retval;
+       u8 value;
+
+       mutex_lock(&slot->ctrl->crit_sect);
+
+       /* has it been >1 sec since our last toggle? */
+       if ((get_seconds() - slot->last_emi_toggle) < 1) {
+               mutex_unlock(&slot->ctrl->crit_sect);
+               return -EINVAL;
+       }
+
+       /* see what our current state is */
+       retval = get_lock_status(hotplug_slot, &value);
+       if (retval || (value == status))
+               goto set_lock_exit;
+
+       slot->hpc_ops->toggle_emi(slot);
+set_lock_exit:
+       mutex_unlock(&slot->ctrl->crit_sect);
+       return 0;
+}
+
+/*
+ * sysfs interface which allows the user to toggle the Electro Mechanical
+ * Interlock.  Valid values are either 0 or 1.  0 == unlock, 1 == lock
+ */
+static ssize_t lock_write_file(struct hotplug_slot *hotplug_slot,
+               const char *buf, size_t count)
+{
+       struct slot *slot = hotplug_slot->private;
+       unsigned long llock;
+       u8 lock;
+       int retval = 0;
+
+       llock = simple_strtoul(buf, NULL, 10);
+       lock = (u8)(llock & 0xff);
+
+       switch (lock) {
+               case 0:
+               case 1:
+                       retval = set_lock_status(hotplug_slot, lock);
+                       break;
+               default:
+                       ctrl_err(slot->ctrl, "%d is an invalid lock value\n",
+                                lock);
+                       retval = -EINVAL;
+       }
+       if (retval)
+               return retval;
+       return count;
+}
+
+static struct hotplug_slot_attribute hotplug_slot_attr_lock = {
+       .attr = {.name = "lock", .mode = S_IFREG | S_IRUGO | S_IWUSR},
+       .show = lock_read_file,
+       .store = lock_write_file
+};
+
 /**
  * release_slot - free up the memory used by a slot
  * @hotplug_slot: slot to free
@@ -95,151 +186,90 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
 {
        struct slot *slot = hotplug_slot->private;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                __func__, hotplug_slot_name(hotplug_slot));
 
-       kfree(slot->hotplug_slot->info);
-       kfree(slot->hotplug_slot->name);
-       kfree(slot->hotplug_slot);
-       kfree(slot);
+       kfree(hotplug_slot->info);
+       kfree(hotplug_slot);
 }
 
 static int init_slots(struct controller *ctrl)
 {
        struct slot *slot;
-       struct hpc_ops *hpc_ops;
        struct hotplug_slot *hotplug_slot;
-       struct hotplug_slot_info *hotplug_slot_info;
-       u8 number_of_slots;
-       u8 slot_device;
-       u32 slot_number;
-       int result = -ENOMEM;
-
-       number_of_slots = ctrl->num_slots;
-       slot_device = ctrl->slot_device_offset;
-       slot_number = ctrl->first_slot;
-
-       while (number_of_slots) {
-               slot = kzalloc(sizeof(*slot), GFP_KERNEL);
-               if (!slot)
+       struct hotplug_slot_info *info;
+       char name[SLOT_NAME_SIZE];
+       int retval = -ENOMEM;
+
+       list_for_each_entry(slot, &ctrl->slot_list, slot_list) {
+               hotplug_slot = kzalloc(sizeof(*hotplug_slot), GFP_KERNEL);
+               if (!hotplug_slot)
                        goto error;
 
-               slot->hotplug_slot =
-                               kzalloc(sizeof(*(slot->hotplug_slot)),
-                                               GFP_KERNEL);
-               if (!slot->hotplug_slot)
-                       goto error_slot;
-               hotplug_slot = slot->hotplug_slot;
-
-               hotplug_slot->info =
-                       kzalloc(sizeof(*(hotplug_slot->info)),
-                                               GFP_KERNEL);
-               if (!hotplug_slot->info)
+               info = kzalloc(sizeof(*info), GFP_KERNEL);
+               if (!info)
                        goto error_hpslot;
-               hotplug_slot_info = hotplug_slot->info;
-               hotplug_slot->name = kmalloc(SLOT_NAME_SIZE, GFP_KERNEL);
-               if (!hotplug_slot->name)
-                       goto error_info;
-
-               slot->ctrl = ctrl;
-               slot->bus = ctrl->slot_bus;
-               slot->device = slot_device;
-               slot->hpc_ops = hpc_ops = ctrl->hpc_ops;
-
-               slot->number = ctrl->first_slot;
-               slot->hp_slot = slot_device - ctrl->slot_device_offset;
 
                /* register this slot with the hotplug pci core */
+               hotplug_slot->info = info;
                hotplug_slot->private = slot;
                hotplug_slot->release = &release_slot;
-               make_slot_name(hotplug_slot->name, SLOT_NAME_SIZE, slot);
                hotplug_slot->ops = &pciehp_hotplug_slot_ops;
-
-               hpc_ops->get_power_status(slot,
-                       &(hotplug_slot_info->power_status));
-               hpc_ops->get_attention_status(slot,
-                       &(hotplug_slot_info->attention_status));
-               hpc_ops->get_latch_status(slot,
-                       &(hotplug_slot_info->latch_status));
-               hpc_ops->get_adapter_status(slot,
-                       &(hotplug_slot_info->adapter_status));
-
-               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);
-               result = pci_hp_register(hotplug_slot);
-               if (result) {
-                       err ("pci_hp_register failed with error %d\n", result);
-                       goto error_name;
+               slot->hotplug_slot = hotplug_slot;
+               snprintf(name, SLOT_NAME_SIZE, "%u", slot->number);
+
+               ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x "
+                        "hp_slot=%x sun=%x slot_device_offset=%x\n",
+                        pci_domain_nr(ctrl->pci_dev->subordinate),
+                        slot->bus, slot->device, slot->hp_slot, slot->number,
+                        ctrl->slot_device_offset);
+               retval = pci_hp_register(hotplug_slot,
+                                        ctrl->pci_dev->subordinate,
+                                        slot->device,
+                                        name);
+               if (retval) {
+                       ctrl_err(ctrl, "pci_hp_register failed with error %d\n",
+                                retval);
+                       goto error_info;
+               }
+               get_power_status(hotplug_slot, &info->power_status);
+               get_attention_status(hotplug_slot, &info->attention_status);
+               get_latch_status(hotplug_slot, &info->latch_status);
+               get_adapter_status(hotplug_slot, &info->adapter_status);
+               /* create additional sysfs entries */
+               if (EMI(ctrl)) {
+                       retval = sysfs_create_file(&hotplug_slot->pci_slot->kobj,
+                               &hotplug_slot_attr_lock.attr);
+                       if (retval) {
+                               pci_hp_deregister(hotplug_slot);
+                               ctrl_err(ctrl, "Cannot create additional sysfs "
+                                        "entries\n");
+                               goto error_info;
+                       }
                }
-
-               slot->next = ctrl->slot;
-               ctrl->slot = slot;
-
-               number_of_slots--;
-               slot_device++;
-               slot_number += ctrl->slot_num_inc;
        }
 
        return 0;
-
-error_name:
-       kfree(hotplug_slot->name);
 error_info:
-       kfree(hotplug_slot_info);
+       kfree(info);
 error_hpslot:
        kfree(hotplug_slot);
-error_slot:
-       kfree(slot);
 error:
-       return result;
-}
-
-
-static int cleanup_slots (struct controller * ctrl)
-{
-       struct slot *old_slot, *next_slot;
-
-       old_slot = ctrl->slot;
-       ctrl->slot = NULL;
-
-       while (old_slot) {
-               next_slot = old_slot->next;
-               pci_hp_deregister (old_slot->hotplug_slot);
-               old_slot = next_slot;
-       }
-
-
-       return(0);
+       return retval;
 }
 
-static int get_ctlr_slot_config(struct controller *ctrl)
+static void cleanup_slots(struct controller *ctrl)
 {
-       int num_ctlr_slots;             /* Not needed; PCI Express has 1 slot per port*/
-       int first_device_num;           /* Not needed */
-       int physical_slot_num;
-       u8 ctrlcap;                     
-       int rc;
+       struct slot *slot;
 
-       rc = pcie_get_ctlr_slot_config(ctrl, &num_ctlr_slots, &first_device_num, &physical_slot_num, &ctrlcap);
-       if (rc) {
-               err("%s: get_ctlr_slot_config fail for b:d (%x:%x)\n", __FUNCTION__, ctrl->bus, ctrl->device);
-               return (-1);
+       list_for_each_entry(slot, &ctrl->slot_list, slot_list) {
+               if (EMI(ctrl))
+                       sysfs_remove_file(&slot->hotplug_slot->pci_slot->kobj,
+                               &hotplug_slot_attr_lock.attr);
+               pci_hp_deregister(slot->hotplug_slot);
        }
-
-       ctrl->num_slots = num_ctlr_slots;       /* PCI Express has 1 slot per port */
-       ctrl->slot_device_offset = first_device_num;
-       ctrl->first_slot = physical_slot_num;
-       ctrl->ctrlcap = ctrlcap;        
-
-       dbg("%s: bus(0x%x) num_slot(0x%x) 1st_dev(0x%x) psn(0x%x) ctrlcap(%x) for b:d (%x:%x)\n",
-               __FUNCTION__, ctrl->slot_bus, num_ctlr_slots, first_device_num, physical_slot_num, ctrlcap, 
-               ctrl->bus, ctrl->device);
-
-       return (0);
 }
 
-
 /*
  * set_attention_status - Turns the Amber LED for a slot on, off or blink
  */
@@ -247,11 +277,12 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
 {
        struct slot *slot = hotplug_slot->private;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                 __func__, slot_name(slot));
 
        hotplug_slot->info->attention_status = status;
-       
-       if (ATTN_LED(slot->ctrl->ctrlcap)) 
+
+       if (ATTN_LED(slot->ctrl))
                slot->hpc_ops->set_attention_status(slot, status);
 
        return 0;
@@ -262,9 +293,10 @@ static int enable_slot(struct hotplug_slot *hotplug_slot)
 {
        struct slot *slot = hotplug_slot->private;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                __func__, slot_name(slot));
 
-       return pciehp_enable_slot(slot);
+       return pciehp_sysfs_enable_slot(slot);
 }
 
 
@@ -272,9 +304,10 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
 {
        struct slot *slot = hotplug_slot->private;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                 __func__, slot_name(slot));
 
-       return pciehp_disable_slot(slot);
+       return pciehp_sysfs_disable_slot(slot);
 }
 
 static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
@@ -282,7 +315,8 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
        struct slot *slot = hotplug_slot->private;
        int retval;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                 __func__, slot_name(slot));
 
        retval = slot->hpc_ops->get_power_status(slot, value);
        if (retval < 0)
@@ -296,7 +330,8 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
        struct slot *slot = hotplug_slot->private;
        int retval;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                 __func__, slot_name(slot));
 
        retval = slot->hpc_ops->get_attention_status(slot, value);
        if (retval < 0)
@@ -310,7 +345,8 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
        struct slot *slot = hotplug_slot->private;
        int retval;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                __func__, slot_name(slot));
 
        retval = slot->hpc_ops->get_latch_status(slot, value);
        if (retval < 0)
@@ -324,7 +360,8 @@ static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
        struct slot *slot = hotplug_slot->private;
        int retval;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                __func__, slot_name(slot));
 
        retval = slot->hpc_ops->get_adapter_status(slot, value);
        if (retval < 0)
@@ -333,25 +370,15 @@ 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", __FUNCTION__, 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;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
-       
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                __func__, slot_name(slot));
+
        retval = slot->hpc_ops->get_max_bus_speed(slot, value);
        if (retval < 0)
                *value = PCI_SPEED_UNKNOWN;
@@ -364,8 +391,9 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
        struct slot *slot = hotplug_slot->private;
        int retval;
 
-       dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
-       
+       ctrl_dbg(slot->ctrl, "%s: physical_slot = %s\n",
+                __func__, slot_name(slot));
+
        retval = slot->hpc_ops->get_cur_bus_speed(slot, value);
        if (retval < 0)
                *value = PCI_SPEED_UNKNOWN;
@@ -378,185 +406,109 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
        int rc;
        struct controller *ctrl;
        struct slot *t_slot;
-       int first_device_num = 0 ;      /* first PCI device number supported by this PCIE */  
-       int num_ctlr_slots;             /* number of slots supported by this HPC */
        u8 value;
-       struct pci_dev *pdev;
-       
-       ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
-       if (!ctrl) {
-               err("%s : out of memory\n", __FUNCTION__);
-               goto err_out_none;
-       }
-
-       pdev = dev->port;
-       ctrl->pci_dev = pdev;
+       struct pci_dev *pdev = dev->port;
 
-       rc = pcie_init(ctrl, dev);
-       if (rc) {
-               dbg("%s: controller initialization failed\n", PCIE_MODULE_NAME);
-               goto err_out_free_ctrl;
-       }
-
-       pci_set_drvdata(pdev, ctrl);
-
-       ctrl->pci_bus = kmalloc(sizeof(*ctrl->pci_bus), GFP_KERNEL);
-       if (!ctrl->pci_bus) {
-               err("%s: out of memory\n", __FUNCTION__);
-               rc = -ENOMEM;
-               goto err_out_unmap_mmio_region;
-       }
-       memcpy (ctrl->pci_bus, pdev->bus, sizeof (*ctrl->pci_bus));
-       ctrl->bus = pdev->bus->number;  /* ctrl bus */
-       ctrl->slot_bus = pdev->subordinate->number;  /* bus controlled by this HPC */
-
-       ctrl->device = PCI_SLOT(pdev->devfn);
-       ctrl->function = PCI_FUNC(pdev->devfn);
-       dbg("%s: ctrl bus=0x%x, device=%x, function=%x, irq=%x\n", __FUNCTION__,
-               ctrl->bus, ctrl->device, ctrl->function, pdev->irq);
-
-       /*
-        *      Save configuration headers for this and subordinate PCI buses
-        */
+       if (pciehp_force)
+               dev_info(&dev->device,
+                        "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;
 
-       rc = get_ctlr_slot_config(ctrl);
-       if (rc) {
-               err(msg_initialization_err, rc);
-               goto err_out_free_ctrl_bus;
+       ctrl = pcie_init(dev);
+       if (!ctrl) {
+               dev_err(&dev->device, "Controller initialization failed\n");
+               goto err_out_none;
        }
-       first_device_num = ctrl->slot_device_offset;
-       num_ctlr_slots = ctrl->num_slots; 
+       set_service_data(dev, ctrl);
 
        /* Setup the slot information structures */
        rc = init_slots(ctrl);
        if (rc) {
-               err(msg_initialization_err, 6);
-               goto err_out_free_ctrl_slot;
+               if (rc == -EBUSY)
+                       ctrl_warn(ctrl, "Slot already registered by another "
+                                 "hotplug driver\n");
+               else
+                       ctrl_err(ctrl, "Slot initialization failed\n");
+               goto err_out_release_ctlr;
        }
 
-       t_slot = pciehp_find_slot(ctrl, first_device_num);
-
-       /*      Finish setting up the hot plug ctrl device */
-       ctrl->next_event = 0;
-
-       if (!pciehp_ctrl_list) {
-               pciehp_ctrl_list = ctrl;
-               ctrl->next = NULL;
+       /* Check if slot is occupied */
+       t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
+       t_slot->hpc_ops->get_adapter_status(t_slot, &value);
+       if (value) {
+               if (pciehp_force)
+                       pciehp_enable_slot(t_slot);
        } else {
-               ctrl->next = pciehp_ctrl_list;
-               pciehp_ctrl_list = ctrl;
-       }
-
-       /* Wait for exclusive access to hardware */
-       mutex_lock(&ctrl->ctrl_lock);
-
-       t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
-       
-       if ((POWER_CTRL(ctrl->ctrlcap)) && !value) {
-               rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
-               if (rc) {
-                       /* Done with exclusive hardware access */
-                       mutex_unlock(&ctrl->ctrl_lock);
-                       goto err_out_free_ctrl_slot;
-               } else
-                       /* Wait for the command to complete */
-                       wait_for_ctrl_irq (ctrl);
+               /* Power off slot if not occupied */
+               if (POWER_CTRL(ctrl)) {
+                       rc = t_slot->hpc_ops->power_off_slot(t_slot);
+                       if (rc)
+                               goto err_out_free_ctrl_slot;
+               }
        }
 
-       /* Done with exclusive hardware access */
-       mutex_unlock(&ctrl->ctrl_lock);
-
        return 0;
 
 err_out_free_ctrl_slot:
        cleanup_slots(ctrl);
-err_out_free_ctrl_bus:
-       kfree(ctrl->pci_bus);
-err_out_unmap_mmio_region:
+err_out_release_ctlr:
        ctrl->hpc_ops->release_ctlr(ctrl);
-err_out_free_ctrl:
-       kfree(ctrl);
 err_out_none:
        return -ENODEV;
 }
 
-
-static int pcie_start_thread(void)
+static void pciehp_remove (struct pcie_device *dev)
 {
-       int retval = 0;
-       
-       dbg("Initialize + Start the notification/polling mechanism \n");
-
-       retval = pciehp_event_start_thread();
-       if (retval) {
-               dbg("pciehp_event_start_thread() failed\n");
-               return retval;
-       }
-
-       return retval;
-}
-
-static void __exit unload_pciehpd(void)
-{
-       struct controller *ctrl;
-       struct controller *tctrl;
-
-       ctrl = pciehp_ctrl_list;
-
-       while (ctrl) {
-               cleanup_slots(ctrl);
-
-               kfree (ctrl->pci_bus);
-
-               ctrl->hpc_ops->release_ctlr(ctrl);
-
-               tctrl = ctrl;
-               ctrl = ctrl->next;
-
-               kfree(tctrl);
-       }
-
-       /* Stop the notification mechanism */
-       pciehp_event_stop_thread();
-
-}
-
-static int hpdriver_context = 0;
+       struct controller *ctrl = get_service_data(dev);
 
-static void pciehp_remove (struct pcie_device *device)
-{
-       printk("%s ENTRY\n", __FUNCTION__);     
-       printk("%s -> Call free_irq for irq = %d\n",  
-               __FUNCTION__, device->irq);
-       free_irq(device->irq, &hpdriver_context);
+       cleanup_slots(ctrl);
+       ctrl->hpc_ops->release_ctlr(ctrl);
 }
 
 #ifdef CONFIG_PM
 static int pciehp_suspend (struct pcie_device *dev, pm_message_t state)
 {
-       printk("%s ENTRY\n", __FUNCTION__);     
+       dev_info(&dev->device, "%s ENTRY\n", __func__);
        return 0;
 }
 
 static int pciehp_resume (struct pcie_device *dev)
 {
-       printk("%s ENTRY\n", __FUNCTION__);     
+       dev_info(&dev->device, "%s ENTRY\n", __func__);
+       if (pciehp_force) {
+               struct controller *ctrl = get_service_data(dev);
+               struct slot *t_slot;
+               u8 status;
+
+               /* reinitialize the chipset's event detection logic */
+               pcie_enable_notification(ctrl);
+
+               t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
+
+               /* Check if slot is occupied */
+               t_slot->hpc_ops->get_adapter_status(t_slot, &status);
+               if (status)
+                       pciehp_enable_slot(t_slot);
+               else
+                       pciehp_disable_slot(t_slot);
+       }
        return 0;
 }
 #endif
 
-static struct pcie_port_service_id port_pci_ids[] = { { 
-       .vendor = PCI_ANY_ID, 
+static struct pcie_port_service_id port_pci_ids[] = { {
+       .vendor = PCI_ANY_ID,
        .device = PCI_ANY_ID,
        .port_type = PCIE_ANY_PORT,
        .service_type = PCIE_PORT_SERVICE_HP,
-       .driver_data =  0, 
+       .driver_data =  0,
        }, { /* end: all zeroes */ }
 };
-static const char device_name[] = "hpdriver";
 
 static struct pcie_port_service_driver hpdriver_portdrv = {
-       .name           = (char *)device_name,
+       .name           = PCIE_MODULE_NAME,
        .id_table       = &port_pci_ids[0],
 
        .probe          = pciehp_probe,
@@ -572,35 +524,19 @@ static int __init pcied_init(void)
 {
        int retval = 0;
 
-#ifdef CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE
-       pciehp_poll_mode = 1;
-#endif
-
-       retval = pcie_start_thread();
-       if (retval)
-               goto error_hpc_init;
-
+       pciehp_firmware_init();
        retval = pcie_port_service_register(&hpdriver_portdrv);
        dbg("pcie_port_service_register = %d\n", retval);
        info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
        if (retval)
-               dbg("%s: Failure to register service\n", __FUNCTION__);
-
-error_hpc_init:
-       if (retval) {
-               pciehp_event_stop_thread();
-       };
-
+               dbg("Failure to register service\n");
        return retval;
 }
 
 static void __exit pcied_cleanup(void)
 {
        dbg("unload_pciehpd()\n");
-       unload_pciehpd();
-
        pcie_port_service_unregister(&hpdriver_portdrv);
-
        info(DRIVER_DESC " version: " DRIVER_VERSION " unloaded\n");
 }