Merge branch 'upstream-fixes'

10 files changed, 232 insertions, 378 deletions

diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 2f1289eebb3c..222a1cc4aa28 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -11,8 +11,7 @@ config HOTPLUG_PCI
         ---help---
           Say Y here if you have a motherboard with a PCI Hotplug controller.
           This allows you to add and remove PCI cards while the machine is
-          powered up and running.  The file system pcihpfs must be mounted
-          in order to interact with any PCI Hotplug controllers.
+          powered up and running.
 
           To compile this driver as a module, choose M here: the
           module will be called pci_hotplug.
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index 7e7f913ba7b9..317457dd4014 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -302,7 +302,7 @@ static int ibm_get_table_from_acpi(char **bufp)
         }
 
         package = (union acpi_object *) buffer.pointer;
-        if(!(package) ||
+        if (!(package) ||
                         (package->type != ACPI_TYPE_PACKAGE) ||
                         !(package->package.elements)) {
                 err("%s:  Invalid APCI object\n", __FUNCTION__);
@@ -405,7 +405,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle,
         }
         info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';
 
-        if(info.current_status && (info.valid & ACPI_VALID_HID) &&
+        if (info.current_status && (info.valid & ACPI_VALID_HID) &&
                         (!strcmp(info.hardware_id.value, IBM_HARDWARE_ID1) ||
                         !strcmp(info.hardware_id.value, IBM_HARDWARE_ID2))) {
                 dbg("found hardware: %s, handle: %p\n", info.hardware_id.value,
@@ -449,13 +449,11 @@ static int __init ibm_acpiphp_init(void)
         }
 
         ibm_note.device = device;
-        status = acpi_install_notify_handler(
-                        ibm_acpi_handle,
-                        ACPI_DEVICE_NOTIFY,
-                        ibm_handle_events,
+        status = acpi_install_notify_handler(ibm_acpi_handle,
+                        ACPI_DEVICE_NOTIFY, ibm_handle_events,
                         &ibm_note);
         if (ACPI_FAILURE(status)) {
-                err("%s:  Failed to register notification handler\n",
+                err("%s: Failed to register notification handler\n",
                                 __FUNCTION__);
                 retval = -EBUSY;
                 goto init_cleanup;
@@ -482,14 +480,13 @@ static void __exit ibm_acpiphp_exit(void)
         if (acpiphp_unregister_attention(&ibm_attention_info))
                 err("%s: attention info deregistration failed", __FUNCTION__);
 
-           status = acpi_remove_notify_handler(
+        status = acpi_remove_notify_handler(
                            ibm_acpi_handle,
                            ACPI_DEVICE_NOTIFY,
                            ibm_handle_events);
-           if (ACPI_FAILURE(status))
-                   err("%s:  Notification handler removal failed\n",
-                                   __FUNCTION__);
-        // remove the /sys entries
+        if (ACPI_FAILURE(status))
+                err("%s: Notification handler removal failed\n", __FUNCTION__);
+        /* remove the /sys entries */
         if (sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr))
                 err("%s: removal of sysfs file apci_table failed\n",
                                 __FUNCTION__);
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index aabf1e70b528..dc59da675c08 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -235,12 +235,12 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
 {
         int rc = 0;
         struct slot *pslot;
-        u8 cmd;
+        u8 cmd = 0x00;     /* avoid compiler warning */
 
         debug("set_attention_status - Entry hotplug_slot[%lx] value[%x]\n",
                         (ulong) hotplug_slot, value);
         ibmphp_lock_operations();
-        cmd = 0x00;     // avoid compiler warning
+
 
         if (hotplug_slot) {
                 switch (value) {
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 7d93dbaf628d..3eefe2cec72d 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -103,13 +103,13 @@ static struct slot *find_slot(struct device_node *dn)
         struct list_head *tmp, *n;
         struct slot *slot;
 
-        list_for_each_safe(tmp, n, &rpaphp_slot_head) {
-                slot = list_entry(tmp, struct slot, rpaphp_slot_list);
-                if (slot->dn == dn)
-                        return slot;
-        }
+        list_for_each_safe(tmp, n, &rpaphp_slot_head) {
+                slot = list_entry(tmp, struct slot, rpaphp_slot_list);
+                if (slot->dn == dn)
+                        return slot;
+        }
 
-        return NULL;
+        return NULL;
 }
 
 static struct pci_dev *dlpar_find_new_dev(struct pci_bus *parent,
@@ -126,9 +126,9 @@ static struct pci_dev *dlpar_find_new_dev(struct pci_bus *parent,
         return NULL;
 }
 
-static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn)
+static void dlpar_pci_add_bus(struct device_node *dn)
 {
-        struct pci_dn *pdn = dn->data;
+        struct pci_dn *pdn = PCI_DN(dn);
         struct pci_controller *phb = pdn->phb;
         struct pci_dev *dev = NULL;
 
@@ -139,52 +139,52 @@ static struct pci_dev *dlpar_pci_add_bus(struct device_node *dn)
         if (!dev) {
                 printk(KERN_ERR "%s: failed to create pci dev for %s\n",
                                 __FUNCTION__, dn->full_name);
-                return NULL;
+                return;
         }
 
         if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
             dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
                 of_scan_pci_bridge(dn, dev);
 
-        rpaphp_init_new_devs(dev->subordinate);
+        pcibios_fixup_new_pci_devices(dev->subordinate,0);
 
         /* Claim new bus resources */
         pcibios_claim_one_bus(dev->bus);
 
         /* ioremap() for child bus, which may or may not succeed */
-        (void) remap_bus_range(dev->bus);
+        remap_bus_range(dev->subordinate);
 
         /* Add new devices to global lists.  Register in proc, sysfs. */
         pci_bus_add_devices(phb->bus);
-
-        /* Confirm new bridge dev was created */
-        dev = dlpar_find_new_dev(phb->bus, dn);
-        if (dev) {
-                if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
-                        printk(KERN_ERR "%s: unexpected header type %d\n",
-                                __FUNCTION__, dev->hdr_type);
-                        return NULL;
-                }
-        }
-
-        return dev;
 }
 
 static int dlpar_add_pci_slot(char *drc_name, struct device_node *dn)
 {
         struct pci_dev *dev;
+        struct pci_controller *phb;
 
-        if (rpaphp_find_pci_bus(dn))
+        if (pcibios_find_pci_bus(dn))
                 return -EINVAL;
 
         /* Add pci bus */
-        dev = dlpar_pci_add_bus(dn);
+        dlpar_pci_add_bus(dn);
+
+        /* Confirm new bridge dev was created */
+        phb = PCI_DN(dn)->phb;
+        dev = dlpar_find_new_dev(phb->bus, dn);
+
         if (!dev) {
                 printk(KERN_ERR "%s: unable to add bus %s\n", __FUNCTION__,
                         drc_name);
                 return -EIO;
         }
 
+        if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
+                printk(KERN_ERR "%s: unexpected header type %d, unable to add bus %s\n",
+                        __FUNCTION__, dev->hdr_type, drc_name);
+                return -EIO;
+        }
+
         /* Add hotplug slot */
         if (rpaphp_add_slot(dn)) {
                 printk(KERN_ERR "%s: unable to add hotplug slot %s\n",
@@ -221,13 +221,13 @@ static int dlpar_remove_phb(char *drc_name, struct device_node *dn)
         struct pci_dn *pdn;
         int rc = 0;
 
-        if (!rpaphp_find_pci_bus(dn))
+        if (!pcibios_find_pci_bus(dn))
                 return -EINVAL;
 
         slot = find_slot(dn);
         if (slot) {
                 /* Remove hotplug slot */
-                if (rpaphp_remove_slot(slot)) {
+                if (rpaphp_deregister_slot(slot)) {
                         printk(KERN_ERR
                                 "%s: unable to remove hotplug slot %s\n",
                                 __FUNCTION__, drc_name);
@@ -366,21 +366,25 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
         struct pci_bus *bus;
         struct slot *slot;
 
-        bus = rpaphp_find_pci_bus(dn);
+        bus = pcibios_find_pci_bus(dn);
         if (!bus)
                 return -EINVAL;
 
         slot = find_slot(dn);
         if (slot) {
                 /* Remove hotplug slot */
-                if (rpaphp_remove_slot(slot)) {
+                if (rpaphp_deregister_slot(slot)) {
                         printk(KERN_ERR
                                 "%s: unable to remove hotplug slot %s\n",
                                 __FUNCTION__, drc_name);
                         return -EIO;
                 }
         } else {
-                rpaphp_unconfig_pci_adapter(bus);
+                struct pci_dev *dev, *tmp;
+                list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
+                        eeh_remove_bus_device(dev);
+                        pci_remove_bus_device(dev);
+                }
         }
 
         if (unmap_bus_range(bus)) {
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index 57ea71a7bda5..310b6186c0e5 100644
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -88,16 +88,10 @@ extern int num_slots;
 /* function prototypes */
 
 /* rpaphp_pci.c */
-extern struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn);
-extern int rpaphp_claim_resource(struct pci_dev *dev, int resource);
 extern int rpaphp_enable_pci_slot(struct slot *slot);
-extern int register_pci_slot(struct slot *slot);
+extern int rpaphp_register_pci_slot(struct slot *slot);
 extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
-extern void rpaphp_init_new_devs(struct pci_bus *bus);
-extern void rpaphp_eeh_init_nodes(struct device_node *dn);
-
-extern int rpaphp_config_pci_adapter(struct pci_bus *bus);
-extern int rpaphp_unconfig_pci_adapter(struct pci_bus *bus);
+extern int rpaphp_get_sensor_state(struct slot *slot, int *state);
 
 /* rpaphp_core.c */
 extern int rpaphp_add_slot(struct device_node *dn);
@@ -108,8 +102,8 @@ extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
 /* rpaphp_slot.c */
 extern void dealloc_slot_struct(struct slot *slot);
 extern struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, int power_domain);
-extern int register_slot(struct slot *slot);
-extern int deregister_slot(struct slot *slot);
+extern int rpaphp_register_slot(struct slot *slot);
+extern int rpaphp_deregister_slot(struct slot *slot);
 extern int rpaphp_get_power_status(struct slot *slot, u8 * value);
 extern int rpaphp_set_attention_status(struct slot *slot, u8 status);
         
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index cf075c34b578..6e79f5675b0d 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -56,25 +56,6 @@ MODULE_LICENSE("GPL");
 
 module_param(debug, bool, 0644);
 
-static int enable_slot(struct hotplug_slot *slot);
-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_adapter_status(struct hotplug_slot *slot, u8 * value);
-static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value);
-
-struct hotplug_slot_ops rpaphp_hotplug_slot_ops = {
-        .owner = THIS_MODULE,
-        .enable_slot = enable_slot,
-        .disable_slot = disable_slot,
-        .set_attention_status = set_attention_status,
-        .get_power_status = get_power_status,
-        .get_attention_status = get_attention_status,
-        .get_adapter_status = get_adapter_status,
-        .get_max_bus_speed = get_max_bus_speed,
-};
-
 static int rpaphp_get_attention_status(struct slot *slot)
 {
         return slot->hotplug_slot->info->attention_status;
@@ -196,11 +177,6 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
         return 0;
 }
 
-int rpaphp_remove_slot(struct slot *slot)
-{
-        return deregister_slot(slot);
-}
-
 static int get_children_props(struct device_node *dn, int **drc_indexes,
                 int **drc_names, int **drc_types, int **drc_power_domains)
 {
@@ -307,13 +283,15 @@ static int is_php_dn(struct device_node *dn, int **indexes, int **names,
         return 0;
 }
 
-/****************************************************************
+/**
+ * rpaphp_add_slot -- add hotplug or dlpar slot
+ *
  *      rpaphp not only registers PCI hotplug slots(HOTPLUG), 
  *      but also logical DR slots(EMBEDDED).
  *      HOTPLUG slot: An adapter can be physically added/removed. 
  *      EMBEDDED slot: An adapter can be logically removed/added
  *                from/to a partition with the slot.
- ***************************************************************/
+ */
 int rpaphp_add_slot(struct device_node *dn)
 {
         struct slot *slot;
@@ -344,7 +322,7 @@ int rpaphp_add_slot(struct device_node *dn)
                         dbg("Found drc-index:0x%x drc-name:%s drc-type:%s\n",
                                         indexes[i + 1], name, type);
 
-                        retval = register_pci_slot(slot);
+                        retval = rpaphp_register_pci_slot(slot);
                 }
         }
 exit:
@@ -393,53 +371,85 @@ static void __exit rpaphp_exit(void)
         cleanup_slots();
 }
 
-static int enable_slot(struct hotplug_slot *hotplug_slot)
+static int __enable_slot(struct slot *slot)
 {
-        int retval = 0;
-        struct slot *slot = (struct slot *)hotplug_slot->private;
+        int state;
+        int retval;
 
-        if (slot->state == CONFIGURED) {
-                dbg("%s: %s is already enabled\n", __FUNCTION__, slot->name);
-                goto exit;
+        if (slot->state == CONFIGURED)
+                return 0;
+
+        retval = rpaphp_get_sensor_state(slot, &state);
+        if (retval)
+                return retval;
+
+        if (state == PRESENT) {
+                pcibios_add_pci_devices(slot->bus);
+                slot->state = CONFIGURED;
+        } else if (state == EMPTY) {
+                slot->state = EMPTY;
+        } else {
+                err("%s: slot[%s] is in invalid state\n", __FUNCTION__, slot->name);
+                slot->state = NOT_VALID;
+                return -EINVAL;
         }
+        return 0;
+}
+
+static int enable_slot(struct hotplug_slot *hotplug_slot)
+{
+        int retval;
+        struct slot *slot = (struct slot *)hotplug_slot->private;
 
-        dbg("ENABLING SLOT %s\n", slot->name);
         down(&rpaphp_sem);
-        retval = rpaphp_enable_pci_slot(slot);
+        retval = __enable_slot(slot);
         up(&rpaphp_sem);
-exit:
-        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
         return retval;
 }
 
-static int disable_slot(struct hotplug_slot *hotplug_slot)
+static int __disable_slot(struct slot *slot)
 {
-        int retval = -EINVAL;
-        struct slot *slot = (struct slot *)hotplug_slot->private;
+        struct pci_dev *dev, *tmp;
 
-        dbg("%s - Entry: slot[%s]\n", __FUNCTION__, slot->name);
+        if (slot->state == NOT_CONFIGURED)
+                return -EINVAL;
 
-        if (slot->state == NOT_CONFIGURED) {
-                dbg("%s: %s is already disabled\n", __FUNCTION__, slot->name);
-                goto exit;
+        list_for_each_entry_safe(dev, tmp, &slot->bus->devices, bus_list) {
+                eeh_remove_bus_device(dev);
+                pci_remove_bus_device(dev);
         }
 
-        dbg("DISABLING SLOT %s\n", slot->name);
+        slot->state = NOT_CONFIGURED;
+        return 0;
+}
+
+static int disable_slot(struct hotplug_slot *hotplug_slot)
+{
+        struct slot *slot = (struct slot *)hotplug_slot->private;
+        int retval;
+
         down(&rpaphp_sem);
-        retval = rpaphp_unconfig_pci_adapter(slot->bus);
+        retval = __disable_slot (slot);
         up(&rpaphp_sem);
-        slot->state = NOT_CONFIGURED;
-        info("%s: devices in slot[%s] unconfigured.\n", __FUNCTION__,
-             slot->name);
-exit:
-        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
+
         return retval;
 }
 
+struct hotplug_slot_ops rpaphp_hotplug_slot_ops = {
+        .owner = THIS_MODULE,
+        .enable_slot = enable_slot,
+        .disable_slot = disable_slot,
+        .set_attention_status = set_attention_status,
+        .get_power_status = get_power_status,
+        .get_attention_status = get_attention_status,
+        .get_adapter_status = get_adapter_status,
+        .get_max_bus_speed = get_max_bus_speed,
+};
+
 module_init(rpaphp_init);
 module_exit(rpaphp_exit);
 
 EXPORT_SYMBOL_GPL(rpaphp_add_slot);
-EXPORT_SYMBOL_GPL(rpaphp_remove_slot);
 EXPORT_SYMBOL_GPL(rpaphp_slot_head);
 EXPORT_SYMBOL_GPL(rpaphp_get_drc_props);
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 396b54b0c847..6f6cbede5135 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -32,37 +32,7 @@
 #include "../pci.h"             /* for pci_add_new_bus */
 #include "rpaphp.h"
 
-static struct pci_bus *find_bus_among_children(struct pci_bus *bus,
-                                        struct device_node *dn)
-{
-        struct pci_bus *child = NULL;
-        struct list_head *tmp;
-        struct device_node *busdn;
-
-        busdn = pci_bus_to_OF_node(bus);
-        if (busdn == dn)
-                return bus;
-
-        list_for_each(tmp, &bus->children) {
-                child = find_bus_among_children(pci_bus_b(tmp), dn);
-                if (child)
-                        break;
-        }
-        return child;
-}
-
-struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn)
-{
-        struct pci_dn *pdn = dn->data;
-
-        if (!pdn  || !pdn->phb || !pdn->phb->bus)
-                return NULL;
-
-        return find_bus_among_children(pdn->phb->bus, dn);
-}
-EXPORT_SYMBOL_GPL(rpaphp_find_pci_bus);
-
-static int rpaphp_get_sensor_state(struct slot *slot, int *state)
+int rpaphp_get_sensor_state(struct slot *slot, int *state)
 {
         int rc;
         int setlevel;
@@ -120,7 +90,7 @@ int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value)
                         /* config/unconfig adapter */
                         *value = slot->state;
                 } else {
-                        bus = rpaphp_find_pci_bus(slot->dn);
+                        bus = pcibios_find_pci_bus(slot->dn);
                         if (bus && !list_empty(&bus->devices))
                                 *value = CONFIGURED;
                         else
@@ -131,140 +101,6 @@ exit:
         return rc;
 }
 
-/* Must be called before pci_bus_add_devices */
-void rpaphp_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus)
-{
-        struct pci_dev *dev;
-
-        list_for_each_entry(dev, &bus->devices, bus_list) {
-                /*
-                 * Skip already-present devices (which are on the
-                 * global device list.)
-                 */
-                if (list_empty(&dev->global_list)) {
-                        int i;
-                        
-                        /* Need to setup IOMMU tables */
-                        ppc_md.iommu_dev_setup(dev);
-
-                        if(fix_bus)
-                                pcibios_fixup_device_resources(dev, bus);
-                        pci_read_irq_line(dev);
-                        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                                struct resource *r = &dev->resource[i];
-
-                                if (r->parent || !r->start || !r->flags)
-                                        continue;
-                                pci_claim_resource(dev, i);
-                        }
-                }
-        }
-}
-
-static void rpaphp_eeh_add_bus_device(struct pci_bus *bus)
-{
-        struct pci_dev *dev;
-
-        list_for_each_entry(dev, &bus->devices, bus_list) {
-                eeh_add_device_late(dev);
-                if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                        struct pci_bus *subbus = dev->subordinate;
-                        if (subbus)
-                                rpaphp_eeh_add_bus_device (subbus);
-                }
-        }
-}
-
-static int rpaphp_pci_config_bridge(struct pci_dev *dev)
-{
-        u8 sec_busno;
-        struct pci_bus *child_bus;
-        struct pci_dev *child_dev;
-
-        dbg("Enter %s:  BRIDGE dev=%s\n", __FUNCTION__, pci_name(dev));
-
-        /* get busno of downstream bus */
-        pci_read_config_byte(dev, PCI_SECONDARY_BUS, &sec_busno);
-                
-        /* add to children of PCI bridge dev->bus */
-        child_bus = pci_add_new_bus(dev->bus, dev, sec_busno);
-        if (!child_bus) {
-                err("%s: could not add second bus\n", __FUNCTION__);
-                return -EIO;
-        }
-        sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number);
-        /* do pci_scan_child_bus */
-        pci_scan_child_bus(child_bus);
-
-        list_for_each_entry(child_dev, &child_bus->devices, bus_list) {
-                eeh_add_device_late(child_dev);
-        }
-
-         /* fixup new pci devices without touching bus struct */
-        rpaphp_fixup_new_pci_devices(child_bus, 0);
-
-        /* Make the discovered devices available */
-        pci_bus_add_devices(child_bus);
-        return 0;
-}
-
-void rpaphp_init_new_devs(struct pci_bus *bus)
-{
-        rpaphp_fixup_new_pci_devices(bus, 0);
-        rpaphp_eeh_add_bus_device(bus);
-}
-EXPORT_SYMBOL_GPL(rpaphp_init_new_devs);
-
-/*****************************************************************************
- rpaphp_pci_config_slot() will  configure all devices under the
- given slot->dn and return the the first pci_dev.
- *****************************************************************************/
-static struct pci_dev *
-rpaphp_pci_config_slot(struct pci_bus *bus)
-{
-        struct device_node *dn = pci_bus_to_OF_node(bus);
-        struct pci_dev *dev = NULL;
-        int slotno;
-        int num;
-
-        dbg("Enter %s: dn=%s bus=%s\n", __FUNCTION__, dn->full_name, bus->name);
-        if (!dn || !dn->child)
-                return NULL;
-
-        if (_machine == PLATFORM_PSERIES_LPAR) {
-                of_scan_bus(dn, bus);
-                if (list_empty(&bus->devices)) {
-                        err("%s: No new device found\n", __FUNCTION__);
-                        return NULL;
-                }
-
-                rpaphp_init_new_devs(bus);
-                pci_bus_add_devices(bus);
-                dev = list_entry(&bus->devices, struct pci_dev, bus_list);
-        } else {
-                slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
-
-                /* pci_scan_slot should find all children */
-                num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
-                if (num) {
-                        rpaphp_fixup_new_pci_devices(bus, 1);
-                        pci_bus_add_devices(bus);
-                }
-                if (list_empty(&bus->devices)) {
-                        err("%s: No new device found\n", __FUNCTION__);
-                        return NULL;
-                }
-                list_for_each_entry(dev, &bus->devices, bus_list) {
-                        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)
-                                rpaphp_pci_config_bridge(dev);
-
-                        rpaphp_eeh_add_bus_device(bus);
-                }
-        }
-
-        return dev;
-}
-
 static void print_slot_pci_funcs(struct pci_bus *bus)
 {
         struct device_node *dn;
@@ -280,60 +116,6 @@ static void print_slot_pci_funcs(struct pci_bus *bus)
         return;
 }
 
-int rpaphp_config_pci_adapter(struct pci_bus *bus)
-{
-        struct device_node *dn = pci_bus_to_OF_node(bus);
-        struct pci_dev *dev;
-        int rc = -ENODEV;
-
-        dbg("Entry %s: slot[%s]\n", __FUNCTION__, dn->full_name);
-        if (!dn)
-                goto exit;
-
-        eeh_add_device_tree_early(dn);
-        dev = rpaphp_pci_config_slot(bus);
-        if (!dev) {
-                err("%s: can't find any devices.\n", __FUNCTION__);
-                goto exit;
-        }
-        print_slot_pci_funcs(bus);
-        rc = 0;
-exit:
-        dbg("Exit %s:  rc=%d\n", __FUNCTION__, rc);
-        return rc;
-}
-EXPORT_SYMBOL_GPL(rpaphp_config_pci_adapter);
-
-static void rpaphp_eeh_remove_bus_device(struct pci_dev *dev)
-{
-        eeh_remove_device(dev);
-        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                struct pci_bus *bus = dev->subordinate;
-                struct list_head *ln;
-                if (!bus)
-                        return; 
-                for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
-                        struct pci_dev *pdev = pci_dev_b(ln);
-                        if (pdev)
-                                rpaphp_eeh_remove_bus_device(pdev);
-                }
-
-        }
-        return;
-}
-
-int rpaphp_unconfig_pci_adapter(struct pci_bus *bus)
-{
-        struct pci_dev *dev, *tmp;
-
-        list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
-                rpaphp_eeh_remove_bus_device(dev);
-                pci_remove_bus_device(dev);
-        }
-        return 0;
-}
-EXPORT_SYMBOL_GPL(rpaphp_unconfig_pci_adapter);
-
 static int setup_pci_hotplug_slot_info(struct slot *slot)
 {
         struct hotplug_slot_info *hotplug_slot_info = slot->hotplug_slot->info;
@@ -370,7 +152,7 @@ static int setup_pci_slot(struct slot *slot)
         struct pci_bus *bus;
 
         BUG_ON(!dn);
-        bus = rpaphp_find_pci_bus(dn);
+        bus = pcibios_find_pci_bus(dn);
         if (!bus) {
                 err("%s: no pci_bus for dn %s\n", __FUNCTION__, dn->full_name);
                 goto exit_rc;
@@ -395,10 +177,7 @@ static int setup_pci_slot(struct slot *slot)
                 if (slot->hotplug_slot->info->adapter_status == NOT_CONFIGURED) {
                         dbg("%s CONFIGURING pci adapter in slot[%s]\n",  
                                 __FUNCTION__, slot->name);
-                        if (rpaphp_config_pci_adapter(slot->bus)) {
-                                err("%s: CONFIG pci adapter failed\n", __FUNCTION__);
-                                goto exit_rc;           
-                        }
+                        pcibios_add_pci_devices(slot->bus);
 
                 } else if (slot->hotplug_slot->info->adapter_status != CONFIGURED) {
                         err("%s: slot[%s]'s adapter_status is NOT_VALID.\n",
@@ -420,7 +199,7 @@ exit_rc:
         return -EINVAL;
 }
 
-int register_pci_slot(struct slot *slot)
+int rpaphp_register_pci_slot(struct slot *slot)
 {
         int rc = -EINVAL;
 
@@ -428,42 +207,8 @@ int register_pci_slot(struct slot *slot)
                 goto exit_rc;
         if (setup_pci_slot(slot))
                 goto exit_rc;
-        rc = register_slot(slot);
+        rc = rpaphp_register_slot(slot);
 exit_rc:
         return rc;
 }
 
-int rpaphp_enable_pci_slot(struct slot *slot)
-{
-        int retval = 0, state;
-
-        retval = rpaphp_get_sensor_state(slot, &state);
-        if (retval)
-                goto exit;
-        dbg("%s: sensor state[%d]\n", __FUNCTION__, state);
-        /* if slot is not empty, enable the adapter */
-        if (state == PRESENT) {
-                dbg("%s : slot[%s] is occupied.\n", __FUNCTION__, slot->name);
-                retval = rpaphp_config_pci_adapter(slot->bus);
-                if (!retval) {
-                        slot->state = CONFIGURED;
-                        info("%s: devices in slot[%s] configured\n",
-                                        __FUNCTION__, slot->name);
-                } else {
-                        slot->state = NOT_CONFIGURED;
-                        dbg("%s: no pci_dev struct for adapter in slot[%s]\n",
-                            __FUNCTION__, slot->name);
-                }
-        } else if (state == EMPTY) {
-                dbg("%s : slot[%s] is empty\n", __FUNCTION__, slot->name);
-                slot->state = EMPTY;
-        } else {
-                err("%s: slot[%s] is in invalid state\n", __FUNCTION__,
-                    slot->name);
-                slot->state = NOT_VALID;
-                retval = -EINVAL;
-        }
-exit:
-        dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
-        return retval;
-}
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index daa89ae57123..78943e064b59 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -35,16 +35,16 @@
 
 static ssize_t location_read_file (struct hotplug_slot *php_slot, char *buf)
 {
-        char *value;
-        int retval = -ENOENT;
+        char *value;
+        int retval = -ENOENT;
         struct slot *slot = (struct slot *)php_slot->private;
 
         if (!slot)
                 return retval;
 
-        value = slot->location;
-        retval = sprintf (buf, "%s\n", value);
-        return retval;
+        value = slot->location;
+        retval = sprintf (buf, "%s\n", value);
+        return retval;
 }
 
 static struct hotplug_slot_attribute hotplug_slot_attr_location = {
@@ -137,7 +137,7 @@ static int is_registered(struct slot *slot)
         return 0;
 }
 
-int deregister_slot(struct slot *slot)
+int rpaphp_deregister_slot(struct slot *slot)
 {
         int retval = 0;
         struct hotplug_slot *php_slot = slot->hotplug_slot;
@@ -159,8 +159,9 @@ int deregister_slot(struct slot *slot)
         dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
         return retval;
 }
+EXPORT_SYMBOL_GPL(rpaphp_deregister_slot);
 
-int register_slot(struct slot *slot)
+int rpaphp_register_slot(struct slot *slot)
 {
         int retval;
 
@@ -169,7 +170,7 @@ int register_slot(struct slot *slot)
                 slot->power_domain, slot->type);
         /* should not try to register the same slot twice */
         if (is_registered(slot)) { /* should't be here */
-                err("register_slot: slot[%s] is already registered\n", slot->name);
+                err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
                 rpaphp_release_slot(slot->hotplug_slot);
                 return -EAGAIN;
         }       
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index ce0e9b6ce833..7d6f521d02ea 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -95,6 +95,7 @@ struct controller {
         u8 function;
         u8 slot_device_offset;
         u8 add_support;
+        u32 pcix_misc2_reg;     /* for amd pogo errata */
         enum pci_bus_speed speed;
         u32 first_slot;         /* First physical slot number */
         u8 slot_bus;            /* Bus where the slots handled by this controller sit */
@@ -113,6 +114,26 @@ struct hotplug_params {
 
 /* Define AMD SHPC ID  */
 #define PCI_DEVICE_ID_AMD_GOLAM_7450    0x7450 
+#define PCI_DEVICE_ID_AMD_POGO_7458     0x7458
+
+/* AMD PCIX bridge registers */
+
+#define PCIX_MEM_BASE_LIMIT_OFFSET      0x1C
+#define PCIX_MISCII_OFFSET              0x48
+#define PCIX_MISC_BRIDGE_ERRORS_OFFSET  0x80
+
+/* AMD PCIX_MISCII masks and offsets */
+#define PERRNONFATALENABLE_MASK         0x00040000
+#define PERRFATALENABLE_MASK            0x00080000
+#define PERRFLOODENABLE_MASK            0x00100000
+#define SERRNONFATALENABLE_MASK         0x00200000
+#define SERRFATALENABLE_MASK            0x00400000
+
+/* AMD PCIX_MISC_BRIDGE_ERRORS masks and offsets */
+#define PERR_OBSERVED_MASK              0x00000001
+
+/* AMD PCIX_MEM_BASE_LIMIT masks */
+#define RSE_MASK                        0x40000000
 
 #define INT_BUTTON_IGNORE               0
 #define INT_PRESENCE_ON                 1
@@ -333,6 +354,79 @@ static inline int wait_for_ctrl_irq (struct controller *ctrl)
         return retval;
 }
 
+static inline void amd_pogo_errata_save_misc_reg(struct slot *p_slot)
+{
+        u32 pcix_misc2_temp;
+
+        /* save MiscII register */
+        pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, &pcix_misc2_temp);
+
+        p_slot->ctrl->pcix_misc2_reg = pcix_misc2_temp;
+
+        /* clear SERR/PERR enable bits */
+        pcix_misc2_temp &= ~SERRFATALENABLE_MASK;
+        pcix_misc2_temp &= ~SERRNONFATALENABLE_MASK;
+        pcix_misc2_temp &= ~PERRFLOODENABLE_MASK;
+        pcix_misc2_temp &= ~PERRFATALENABLE_MASK;
+        pcix_misc2_temp &= ~PERRNONFATALENABLE_MASK;
+        pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, pcix_misc2_temp);
+}
+
+static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)
+{
+        u32 pcix_misc2_temp;
+        u32 pcix_bridge_errors_reg;
+        u32 pcix_mem_base_reg;
+        u8  perr_set;
+        u8  rse_set;
+
+        /* write-one-to-clear Bridge_Errors[ PERR_OBSERVED ] */
+        pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MISC_BRIDGE_ERRORS_OFFSET, &pcix_bridge_errors_reg);
+        perr_set = pcix_bridge_errors_reg & PERR_OBSERVED_MASK;
+        if (perr_set) {
+                dbg ("%s  W1C: Bridge_Errors[ PERR_OBSERVED = %08X]\n",__FUNCTION__ , perr_set);
+
+                pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISC_BRIDGE_ERRORS_OFFSET, perr_set);
+        }
+
+        /* write-one-to-clear Memory_Base_Limit[ RSE ] */
+        pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, &pcix_mem_base_reg);
+        rse_set = pcix_mem_base_reg & RSE_MASK;
+        if (rse_set) {
+                dbg ("%s  W1C: Memory_Base_Limit[ RSE ]\n",__FUNCTION__ );
+
+                pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, rse_set);
+        }
+        /* restore MiscII register */
+        pci_read_config_dword( p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, &pcix_misc2_temp );
+
+        if (p_slot->ctrl->pcix_misc2_reg & SERRFATALENABLE_MASK)
+                pcix_misc2_temp |= SERRFATALENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~SERRFATALENABLE_MASK;
+
+        if (p_slot->ctrl->pcix_misc2_reg & SERRNONFATALENABLE_MASK)
+                pcix_misc2_temp |= SERRNONFATALENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~SERRNONFATALENABLE_MASK;
+
+        if (p_slot->ctrl->pcix_misc2_reg & PERRFLOODENABLE_MASK)
+                pcix_misc2_temp |= PERRFLOODENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~PERRFLOODENABLE_MASK;
+
+        if (p_slot->ctrl->pcix_misc2_reg & PERRFATALENABLE_MASK)
+                pcix_misc2_temp |= PERRFATALENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~PERRFATALENABLE_MASK;
+
+        if (p_slot->ctrl->pcix_misc2_reg & PERRNONFATALENABLE_MASK)
+                pcix_misc2_temp |= PERRNONFATALENABLE_MASK;
+        else
+                pcix_misc2_temp &= ~PERRNONFATALENABLE_MASK;
+        pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, pcix_misc2_temp);
+}
+
 #define SLOT_NAME_SIZE 10
 
 static inline void make_slot_name(char *buffer, int buffer_size, struct slot *slot)
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 25ccb0e47593..643252d9bf3b 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -894,7 +894,17 @@ int shpchp_enable_slot (struct slot *p_slot)
         dbg("%s: p_slot->pwr_save %x\n", __FUNCTION__, p_slot->pwr_save);
         p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
 
-        rc = board_added(p_slot);
+        if(((p_slot->ctrl->pci_dev->vendor == PCI_VENDOR_ID_AMD) ||
+            (p_slot->ctrl->pci_dev->device == PCI_DEVICE_ID_AMD_POGO_7458))
+             && p_slot->ctrl->num_slots == 1) {
+                /* handle amd pogo errata; this must be done before enable  */
+                amd_pogo_errata_save_misc_reg(p_slot);
+                rc = board_added(p_slot);
+                /* handle amd pogo errata; this must be done after enable  */
+                amd_pogo_errata_restore_misc_reg(p_slot);
+        } else
+                rc = board_added(p_slot);
+
         if (rc) {
                 p_slot->hpc_ops->get_adapter_status(p_slot,
                                 &(p_slot->presence_save));