include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6] / drivers / pci / hotplug / sgi_hotplug.c
index a32ae82..72d507b 100644 (file)
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 2005-2006 Silicon Graphics, Inc. All rights reserved.
  *
  * This work was based on the 2.4/2.6 kernel development by Dick Reigner.
  * Work to add BIOS PROM support was completed by Mike Habeck.
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/proc_fs.h>
+#include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/mutex.h>
 
 #include <asm/sn/addrs.h>
+#include <asm/sn/geo.h>
 #include <asm/sn/l1.h>
 #include <asm/sn/module.h>
 #include <asm/sn/pcibr_provider.h>
 #include <asm/sn/pcibus_provider_defs.h>
 #include <asm/sn/pcidev.h>
+#include <asm/sn/sn_feature_sets.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/types.h>
+#include <linux/acpi.h>
+#include <asm/sn/acpi.h>
 
 #include "../pci.h"
-#include "pci_hotplug.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("SGI (prarit@sgi.com, dickie@sgi.com, habeck@sgi.com)");
 MODULE_DESCRIPTION("SGI Altix Hot Plug PCI Controller Driver");
 
-#define PCIIO_ASIC_TYPE_TIOCA          4
+
+/* SAL call error codes. Keep in sync with prom header io/include/pcibr.h */
 #define PCI_SLOT_ALREADY_UP            2       /* slot already up */
 #define PCI_SLOT_ALREADY_DOWN          3       /* slot already down */
 #define PCI_L1_ERR                     7       /* L1 console command error */
 #define PCI_EMPTY_33MHZ                        15      /* empty 33 MHz bus */
+
+
+#define PCIIO_ASIC_TYPE_TIOCA          4
 #define PCI_L1_QSIZE                   128     /* our L1 message buffer size */
 #define SN_MAX_HP_SLOTS                        32      /* max hotplug slots */
-#define SGI_HOTPLUG_PROM_REV           0x0430  /* Min. required PROM version */
 #define SN_SLOT_NAME_SIZE              33      /* size of name string */
 
 /* internal list head */
@@ -75,19 +84,17 @@ static int disable_slot(struct hotplug_slot *slot);
 static inline int get_power_status(struct hotplug_slot *slot, u8 *value);
 
 static struct hotplug_slot_ops sn_hotplug_slot_ops = {
-       .owner                  = THIS_MODULE,
        .enable_slot            = enable_slot,
        .disable_slot           = disable_slot,
        .get_power_status       = get_power_status,
 };
 
-static DECLARE_MUTEX(sn_hotplug_sem);
+static DEFINE_MUTEX(sn_hotplug_mutex);
 
-static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot,
-                         char *buf)
+static ssize_t path_show(struct pci_slot *pci_slot, char *buf)
 {
        int retval = -ENOENT;
-       struct slot *slot = bss_hotplug_slot->private;
+       struct slot *slot = pci_slot->hotplug->private;
 
        if (!slot)
                return retval;
@@ -96,13 +103,12 @@ static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot,
        return retval;
 }
 
-static struct hotplug_slot_attribute sn_slot_path_attr = __ATTR_RO(path);
+static struct pci_slot_attribute sn_slot_path_attr = __ATTR_RO(path);
 
 static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)
 {
        struct pcibus_info *pcibus_info;
-       int bricktype;
-       int bus_num;
+       u16 busnum, segment, ioboard_type;
 
        pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);
 
@@ -110,12 +116,14 @@ static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)
        if (!(pcibus_info->pbi_valid_devices & (1 << device)))
                return -EPERM;
 
-       bricktype = MODULE_GET_BTYPE(pcibus_info->pbi_moduleid);
-       bus_num = pcibus_info->pbi_buscommon.bs_persist_busnum & 0xf;
+       ioboard_type = sn_ioboard_to_pci_bus(pci_bus);
+       busnum = pcibus_info->pbi_buscommon.bs_persist_busnum;
+       segment = pci_domain_nr(pci_bus) & 0xf;
 
        /* Do not allow hotplug operations on base I/O cards */
-       if ((bricktype == L1_BRICKTYPE_IX ||  bricktype == L1_BRICKTYPE_IA) &&
-           (bus_num == 1 && device != 1))
+       if ((ioboard_type == L1_BRICKTYPE_IX ||
+            ioboard_type == L1_BRICKTYPE_IA) &&
+           (segment == 1 && busnum == 0 && device != 1))
                return -EPERM;
 
        return 1;
@@ -124,23 +132,23 @@ static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)
 static int sn_pci_bus_valid(struct pci_bus *pci_bus)
 {
        struct pcibus_info *pcibus_info;
-       int asic_type;
-       int bricktype;
-
-       pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);
+       u32 asic_type;
+       u16 ioboard_type;
 
        /* Don't register slots hanging off the TIOCA bus */
+       pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus);
        asic_type = pcibus_info->pbi_buscommon.bs_asic_type;
        if (asic_type == PCIIO_ASIC_TYPE_TIOCA)
                return -EPERM;
 
        /* Only register slots in I/O Bricks that support hotplug */
-       bricktype = MODULE_GET_BTYPE(pcibus_info->pbi_moduleid);
-       switch (bricktype) {
+       ioboard_type = sn_ioboard_to_pci_bus(pci_bus);
+       switch (ioboard_type) {
                case L1_BRICKTYPE_IX:
                case L1_BRICKTYPE_PX:
                case L1_BRICKTYPE_IA:
                case L1_BRICKTYPE_PA:
+               case L1_BOARDTYPE_PCIX3SLOT:
                        return 1;
                        break;
                default:
@@ -152,7 +160,8 @@ static int sn_pci_bus_valid(struct pci_bus *pci_bus)
 }
 
 static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,
-                                   struct pci_bus *pci_bus, int device)
+                                   struct pci_bus *pci_bus, int device,
+                                   char *name)
 {
        struct pcibus_info *pcibus_info;
        struct slot *slot;
@@ -164,24 +173,15 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,
                return -ENOMEM;
        bss_hotplug_slot->private = slot;
 
-       bss_hotplug_slot->name = kmalloc(SN_SLOT_NAME_SIZE, GFP_KERNEL);
-       if (!bss_hotplug_slot->name) {
-               kfree(bss_hotplug_slot->private);
-               return -ENOMEM;
-       }
-
        slot->device_num = device;
        slot->pci_bus = pci_bus;
-       sprintf(bss_hotplug_slot->name, "%04x:%02x:%02x",
+       sprintf(name, "%04x:%02x:%02x",
                pci_domain_nr(pci_bus),
-               ((int)pcibus_info->pbi_buscommon.bs_persist_busnum) & 0xf,
+               ((u16)pcibus_info->pbi_buscommon.bs_persist_busnum),
                device + 1);
-       sprintf(slot->physical_path, "module_%c%c%c%c%.2d",
-               '0'+RACK_GET_CLASS(MODULE_GET_RACK(pcibus_info->pbi_moduleid)),
-               '0'+RACK_GET_GROUP(MODULE_GET_RACK(pcibus_info->pbi_moduleid)),
-               '0'+RACK_GET_NUM(MODULE_GET_RACK(pcibus_info->pbi_moduleid)),
-               MODULE_GET_BTCHAR(pcibus_info->pbi_moduleid),
-               MODULE_GET_BPOS(pcibus_info->pbi_moduleid));
+
+       sn_generate_path(pci_bus, slot->physical_path);
+
        slot->hotplug_slot = bss_hotplug_slot;
        list_add(&slot->hp_list, &sn_hp_list);
 
@@ -191,34 +191,21 @@ 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;
        }
        return bss_hotplug_slot;
 }
 
-static void sn_bus_alloc_data(struct pci_dev *dev)
-{
-       struct pci_bus *subordinate_bus;
-       struct pci_dev *child;
-
-       sn_pci_fixup_slot(dev);
-
-       /* Recursively sets up the sn_irq_info structs */
-       if (dev->subordinate) {
-               subordinate_bus = dev->subordinate;
-               list_for_each_entry(child, &subordinate_bus->devices, bus_list)
-                       sn_bus_alloc_data(child);
-       }
-}
-
 static void sn_bus_free_data(struct pci_dev *dev)
 {
        struct pci_bus *subordinate_bus;
@@ -230,11 +217,18 @@ static void sn_bus_free_data(struct pci_dev *dev)
                list_for_each_entry(child, &subordinate_bus->devices, bus_list)
                        sn_bus_free_data(child);
        }
+       /*
+        * Some drivers may use dma accesses during the
+        * driver remove function. We release the sysdata
+        * areas after the driver remove functions have
+        * been called.
+        */
+       sn_bus_store_sysdata(dev);
        sn_pci_unfixup_slot(dev);
 }
 
 static int sn_slot_enable(struct hotplug_slot *bss_hotplug_slot,
-                         int device_num)
+                         int device_num, char **ssdt)
 {
        struct slot *slot = bss_hotplug_slot->private;
        struct pcibus_info *pcibus_info;
@@ -247,22 +241,23 @@ static int sn_slot_enable(struct hotplug_slot *bss_hotplug_slot,
         * Power-on and initialize the slot in the SN
         * PCI infrastructure.
         */
-       rc = sal_pcibr_slot_enable(pcibus_info, device_num, &resp);
+       rc = sal_pcibr_slot_enable(pcibus_info, device_num, &resp, ssdt);
+
 
        if (rc == PCI_SLOT_ALREADY_UP) {
-               dev_dbg(slot->pci_bus->self, "is already active\n");
+               dev_dbg(&slot->pci_bus->self->dev, "is already active\n");
                return 1; /* return 1 to user */
        }
 
        if (rc == PCI_L1_ERR) {
-               dev_dbg(slot->pci_bus->self,
+               dev_dbg(&slot->pci_bus->self->dev,
                        "L1 failure %d with message: %s",
                        resp.resp_sub_errno, resp.resp_l1_msg);
                return -EPERM;
        }
 
        if (rc) {
-               dev_dbg(slot->pci_bus->self,
+               dev_dbg(&slot->pci_bus->self->dev,
                        "insert failed with error %d sub-error %d\n",
                        rc, resp.resp_sub_errno);
                return -EIO;
@@ -288,25 +283,25 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot,
 
        if ((action == PCI_REQ_SLOT_ELIGIBLE) &&
            (rc == PCI_SLOT_ALREADY_DOWN)) {
-               dev_dbg(slot->pci_bus->self, "Slot %s already inactive\n");
+               dev_dbg(&slot->pci_bus->self->dev, "Slot %s already inactive\n", slot->physical_path);
                return 1; /* return 1 to user */
        }
 
        if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_EMPTY_33MHZ)) {
-               dev_dbg(slot->pci_bus->self,
+               dev_dbg(&slot->pci_bus->self->dev,
                        "Cannot remove last 33MHz card\n");
                return -EPERM;
        }
 
        if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_L1_ERR)) {
-               dev_dbg(slot->pci_bus->self,
+               dev_dbg(&slot->pci_bus->self->dev,
                        "L1 failure %d with message \n%s\n",
                        resp.resp_sub_errno, resp.resp_l1_msg);
                return -EPERM;
        }
 
        if ((action == PCI_REQ_SLOT_ELIGIBLE) && rc) {
-               dev_dbg(slot->pci_bus->self,
+               dev_dbg(&slot->pci_bus->self->dev,
                        "remove failed with error %d sub-error %d\n",
                        rc, resp.resp_sub_errno);
                return -EIO;
@@ -318,17 +313,22 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot,
        if ((action == PCI_REQ_SLOT_DISABLE) && !rc) {
                pcibus_info = SN_PCIBUS_BUSSOFT_INFO(slot->pci_bus);
                pcibus_info->pbi_enabled_devices &= ~(1 << device_num);
-               dev_dbg(slot->pci_bus->self, "remove successful\n");
+               dev_dbg(&slot->pci_bus->self->dev, "remove successful\n");
                return 0;
        }
 
        if ((action == PCI_REQ_SLOT_DISABLE) && rc) {
-               dev_dbg(slot->pci_bus->self,"remove failed rc = %d\n", rc);
+               dev_dbg(&slot->pci_bus->self->dev,"remove failed rc = %d\n", rc);
        }
 
        return rc;
 }
 
+/*
+ * Power up and configure the slot via a SAL call to PROM.
+ * Scan slot (and any children), do any platform specific fixup,
+ * and find device driver.
+ */
 static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
 {
        struct slot *slot = bss_hotplug_slot->private;
@@ -337,31 +337,45 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
        int func, num_funcs;
        int new_ppb = 0;
        int rc;
+       char *ssdt = NULL;
+       void pcibios_fixup_device_resources(struct pci_dev *);
 
        /* Serialize the Linux PCI infrastructure */
-       down(&sn_hotplug_sem);
+       mutex_lock(&sn_hotplug_mutex);
 
        /*
         * Power-on and initialize the slot in the SN
-        * PCI infrastructure.
+        * PCI infrastructure. Also, retrieve the ACPI SSDT
+        * table for the slot (if ACPI capable PROM).
         */
-       rc = sn_slot_enable(bss_hotplug_slot, slot->device_num);
+       rc = sn_slot_enable(bss_hotplug_slot, slot->device_num, &ssdt);
        if (rc) {
-               up(&sn_hotplug_sem);
+               mutex_unlock(&sn_hotplug_mutex);
                return rc;
        }
 
+       if (ssdt)
+               ssdt = __va(ssdt);
+       /* Add the new SSDT for the slot to the ACPI namespace */
+       if (SN_ACPI_BASE_SUPPORT() && ssdt) {
+               acpi_status ret;
+
+               ret = acpi_load_table((struct acpi_table_header *)ssdt);
+               if (ACPI_FAILURE(ret)) {
+                       printk(KERN_ERR "%s: acpi_load_table failed (0x%x)\n",
+                              __func__, ret);
+                       /* try to continue on */
+               }
+       }
+
        num_funcs = pci_scan_slot(slot->pci_bus,
                                  PCI_DEVFN(slot->device_num + 1, 0));
        if (!num_funcs) {
-               dev_dbg(slot->pci_bus->self, "no device in slot\n");
-               up(&sn_hotplug_sem);
+               dev_dbg(&slot->pci_bus->self->dev, "no device in slot\n");
+               mutex_unlock(&sn_hotplug_mutex);
                return -ENODEV;
        }
 
-       sn_pci_controller_fixup(pci_domain_nr(slot->pci_bus),
-                               slot->pci_bus->number,
-                               slot->pci_bus);
        /*
         * Map SN resources for all functions on the card
         * to the Linux PCI interface and tell the drivers
@@ -372,6 +386,16 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                                   PCI_DEVFN(slot->device_num + 1,
                                             PCI_FUNC(func)));
                if (dev) {
+                       /* Need to do slot fixup on PPB before fixup of children
+                        * (PPB's pcidev_info needs to be in pcidev_info list
+                        * before child's SN_PCIDEV_INFO() call to setup
+                        * pdi_host_pcidev_info).
+                        */
+                       pcibios_fixup_device_resources(dev);
+                       if (SN_ACPI_BASE_SUPPORT())
+                               sn_acpi_slot_fixup(dev);
+                       else
+                               sn_io_slot_fixup(dev);
                        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
                                unsigned char sec_bus;
                                pci_read_config_byte(dev, PCI_SECONDARY_BUS,
@@ -379,29 +403,82 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                                new_bus = pci_add_new_bus(dev->bus, dev,
                                                          sec_bus);
                                pci_scan_child_bus(new_bus);
-                               sn_pci_controller_fixup(pci_domain_nr(new_bus),
-                                                       new_bus->number,
-                                                       new_bus);
                                new_ppb = 1;
                        }
-                       sn_bus_alloc_data(dev);
                        pci_dev_put(dev);
                }
        }
 
+       /*
+        * Add the slot's devices to the ACPI infrastructure */
+       if (SN_ACPI_BASE_SUPPORT() && ssdt) {
+               unsigned long long adr;
+               struct acpi_device *pdevice;
+               struct acpi_device *device;
+               acpi_handle phandle;
+               acpi_handle chandle = NULL;
+               acpi_handle rethandle;
+               acpi_status ret;
+
+               phandle = PCI_CONTROLLER(slot->pci_bus)->acpi_handle;
+
+               if (acpi_bus_get_device(phandle, &pdevice)) {
+                       dev_dbg(&slot->pci_bus->self->dev,
+                               "no parent device, assuming NULL\n");
+                       pdevice = NULL;
+               }
+
+               /*
+                * Walk the rootbus node's immediate children looking for
+                * the slot's device node(s). There can be more than
+                * one for multifunction devices.
+                */
+               for (;;) {
+                       rethandle = NULL;
+                       ret = acpi_get_next_object(ACPI_TYPE_DEVICE,
+                                                  phandle, chandle,
+                                                  &rethandle);
+
+                       if (ret == AE_NOT_FOUND || rethandle == NULL)
+                               break;
+
+                       chandle = rethandle;
+
+                       ret = acpi_evaluate_integer(chandle, METHOD_NAME__ADR,
+                                                   NULL, &adr);
+
+                       if (ACPI_SUCCESS(ret) &&
+                           (adr>>16) == (slot->device_num + 1)) {
+
+                               ret = acpi_bus_add(&device, pdevice, chandle,
+                                                  ACPI_BUS_TYPE_DEVICE);
+                               if (ACPI_FAILURE(ret)) {
+                                       printk(KERN_ERR "%s: acpi_bus_add "
+                                              "failed (0x%x) for slot %d "
+                                              "func %d\n", __func__,
+                                              ret, (int)(adr>>16),
+                                              (int)(adr&0xffff));
+                                       /* try to continue on */
+                               } else {
+                                       acpi_bus_start(device);
+                               }
+                       }
+               }
+       }
+
        /* Call the driver for the new device */
        pci_bus_add_devices(slot->pci_bus);
        /* Call the drivers for the new devices subordinate to PPB */
        if (new_ppb)
                pci_bus_add_devices(new_bus);
 
-       up(&sn_hotplug_sem);
+       mutex_unlock(&sn_hotplug_mutex);
 
        if (rc == 0)
-               dev_dbg(slot->pci_bus->self,
+               dev_dbg(&slot->pci_bus->self->dev,
                        "insert operation successful\n");
        else
-               dev_dbg(slot->pci_bus->self,
+               dev_dbg(&slot->pci_bus->self->dev,
                        "insert operation failed rc = %d\n", rc);
 
        return rc;
@@ -413,9 +490,10 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
        struct pci_dev *dev;
        int func;
        int rc;
+       acpi_owner_id ssdt_id = 0;
 
        /* Acquire update access to the bus */
-       down(&sn_hotplug_sem);
+       mutex_lock(&sn_hotplug_mutex);
 
        /* is it okay to bring this slot down? */
        rc = sn_slot_disable(bss_hotplug_slot, slot->device_num,
@@ -423,25 +501,76 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
        if (rc)
                goto leaving;
 
+       /* free the ACPI resources for the slot */
+       if (SN_ACPI_BASE_SUPPORT() &&
+            PCI_CONTROLLER(slot->pci_bus)->acpi_handle) {
+               unsigned long long adr;
+               struct acpi_device *device;
+               acpi_handle phandle;
+               acpi_handle chandle = NULL;
+               acpi_handle rethandle;
+               acpi_status ret;
+
+               /* Get the rootbus node pointer */
+               phandle = PCI_CONTROLLER(slot->pci_bus)->acpi_handle;
+
+               /*
+                * Walk the rootbus node's immediate children looking for
+                * the slot's device node(s). There can be more than
+                * one for multifunction devices.
+                */
+               for (;;) {
+                       rethandle = NULL;
+                       ret = acpi_get_next_object(ACPI_TYPE_DEVICE,
+                                                  phandle, chandle,
+                                                  &rethandle);
+
+                       if (ret == AE_NOT_FOUND || rethandle == NULL)
+                               break;
+
+                       chandle = rethandle;
+
+                       ret = acpi_evaluate_integer(chandle,
+                                                   METHOD_NAME__ADR,
+                                                   NULL, &adr);
+                       if (ACPI_SUCCESS(ret) &&
+                           (adr>>16) == (slot->device_num + 1)) {
+                               /* retain the owner id */
+                               acpi_get_id(chandle, &ssdt_id);
+
+                               ret = acpi_bus_get_device(chandle,
+                                                         &device);
+                               if (ACPI_SUCCESS(ret))
+                                       acpi_bus_trim(device, 1);
+                       }
+               }
+
+       }
+
        /* Free the SN resources assigned to the Linux device.*/
        for (func = 0; func < 8;  func++) {
                dev = pci_get_slot(slot->pci_bus,
                                   PCI_DEVFN(slot->device_num + 1,
                                             PCI_FUNC(func)));
                if (dev) {
-                       /*
-                        * Some drivers may use dma accesses during the
-                        * driver remove function. We release the sysdata
-                        * areas after the driver remove functions have
-                        * been called.
-                        */
-                       sn_bus_store_sysdata(dev);
                        sn_bus_free_data(dev);
                        pci_remove_bus_device(dev);
                        pci_dev_put(dev);
                }
        }
 
+       /* Remove the SSDT for the slot from the ACPI namespace */
+       if (SN_ACPI_BASE_SUPPORT() && ssdt_id) {
+               acpi_status ret;
+               ret = acpi_unload_table_id(ssdt_id);
+               if (ACPI_FAILURE(ret)) {
+                       printk(KERN_ERR "%s: acpi_unload_table_id "
+                              "failed (0x%x) for id %d\n",
+                              __func__, ret, ssdt_id);
+                       /* try to continue on */
+               }
+       }
+
        /* free the collected sysdata pointers */
        sn_bus_free_sysdata();
 
@@ -450,7 +579,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
                             PCI_REQ_SLOT_DISABLE);
  leaving:
        /* Release the bus lock */
-       up(&sn_hotplug_sem);
+       mutex_unlock(&sn_hotplug_mutex);
 
        return rc;
 }
@@ -460,18 +589,19 @@ static inline int get_power_status(struct hotplug_slot *bss_hotplug_slot,
 {
        struct slot *slot = bss_hotplug_slot->private;
        struct pcibus_info *pcibus_info;
+       u32 power;
 
        pcibus_info = SN_PCIBUS_BUSSOFT_INFO(slot->pci_bus);
-       down(&sn_hotplug_sem);
-       *value = pcibus_info->pbi_enabled_devices & (1 << slot->device_num);
-       up(&sn_hotplug_sem);
+       mutex_lock(&sn_hotplug_mutex);
+       power = pcibus_info->pbi_enabled_devices & (1 << slot->device_num);
+       *value = power ? 1 : 0;
+       mutex_unlock(&sn_hotplug_mutex);
        return 0;
 }
 
 static void sn_release_slot(struct hotplug_slot *bss_hotplug_slot)
 {
        kfree(bss_hotplug_slot->info);
-       kfree(bss_hotplug_slot->name);
        kfree(bss_hotplug_slot->private);
        kfree(bss_hotplug_slot);
 }
@@ -479,7 +609,9 @@ 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;
+       char name[SN_SLOT_NAME_SIZE];
        int rc = 0;
 
        /*
@@ -507,33 +639,33 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus)
                }
 
                if (sn_hp_slot_private_alloc(bss_hotplug_slot,
-                                            pci_bus, device)) {
+                                            pci_bus, device, name)) {
                        rc = -ENOMEM;
                        goto alloc_err;
                }
-
                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, name);
                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;
        }
-       dev_dbg(pci_bus->self, "Registered bus with hotplug\n");
+       dev_dbg(&pci_bus->self->dev, "Registered bus with hotplug\n");
        return rc;
 
 register_err:
-       dev_dbg(pci_bus->self, "bus failed to register with err = %d\n",
-               rc);
+       dev_dbg(&pci_bus->self->dev, "bus failed to register with err = %d\n",
+               rc);
 
 alloc_err:
        if (rc == -ENOMEM)
-               dev_dbg(pci_bus->self, "Memory allocation error\n");
+               dev_dbg(&pci_bus->self->dev, "Memory allocation error\n");
 
        /* destroy THIS element */
        if (bss_hotplug_slot)
@@ -546,15 +678,15 @@ alloc_err:
        return rc;
 }
 
-static int sn_pci_hotplug_init(void)
+static int __init sn_pci_hotplug_init(void)
 {
        struct pci_bus *pci_bus = NULL;
        int rc;
        int registered = 0;
 
-       if (sn_sal_rev() < SGI_HOTPLUG_PROM_REV) {
-               printk(KERN_ERR "%s: PROM version must be greater than 4.30\n",
-                      __FUNCTION__);
+       if (!sn_prom_feature_available(PRF_HOTPLUG_SUPPORT)) {
+               printk(KERN_ERR "%s: PROM version does not support hotplug.\n",
+                      __func__);
                return -EPERM;
        }
 
@@ -566,10 +698,10 @@ static int sn_pci_hotplug_init(void)
 
                rc = sn_pci_bus_valid(pci_bus);
                if (rc != 1) {
-                       dev_dbg(pci_bus->self, "not a valid hotplug bus\n");
+                       dev_dbg(&pci_bus->self->dev, "not a valid hotplug bus\n");
                        continue;
                }
-               dev_dbg(pci_bus->self, "valid hotplug bus\n");
+               dev_dbg(&pci_bus->self->dev, "valid hotplug bus\n");
 
                rc = sn_hotplug_slot_register(pci_bus);
                if (!rc) {
@@ -583,7 +715,7 @@ static int sn_pci_hotplug_init(void)
        return registered == 1 ? 0 : -ENODEV;
 }
 
-static void sn_pci_hotplug_exit(void)
+static void __exit sn_pci_hotplug_exit(void)
 {
        struct hotplug_slot *bss_hotplug_slot;