12 files changed, 137 insertions, 53 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 9ddf69e3bbef..806c44fa645a 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -800,20 +800,10 @@ static int __ref enable_device(struct acpiphp_slot *slot)
         if (slot->flags & SLOT_ENABLED)
                 goto err_exit;
 
-        /* sanity check: dev should be NULL when hot-plugged in */
-        dev = pci_get_slot(bus, PCI_DEVFN(slot->device, 0));
-        if (dev) {
-                /* This case shouldn't happen */
-                err("pci_dev structure already exists.\n");
-                pci_dev_put(dev);
-                retval = -1;
-                goto err_exit;
-        }
-
         num = pci_scan_slot(bus, PCI_DEVFN(slot->device, 0));
         if (num == 0) {
-                err("No new device found\n");
-                retval = -1;
+                /* Maybe only part of funcs are added. */
+                dbg("No new device found\n");
                 goto err_exit;
         }
 
@@ -848,11 +838,16 @@ static int __ref enable_device(struct acpiphp_slot *slot)
 
         pci_bus_add_devices(bus);
 
+        slot->flags |= SLOT_ENABLED;
         list_for_each_entry(func, &slot->funcs, sibling) {
                 dev = pci_get_slot(bus, PCI_DEVFN(slot->device,
                                                   func->function));
-                if (!dev)
+                if (!dev) {
+                        /* Do not set SLOT_ENABLED flag if some funcs
+                           are not added. */
+                        slot->flags &= (~SLOT_ENABLED);
                         continue;
+                }
 
                 if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE &&
                     dev->hdr_type != PCI_HEADER_TYPE_CARDBUS) {
@@ -867,7 +862,6 @@ static int __ref enable_device(struct acpiphp_slot *slot)
                 pci_dev_put(dev);
         }
 
-        slot->flags |= SLOT_ENABLED;
 
  err_exit:
         return retval;
@@ -892,9 +886,12 @@ static int disable_device(struct acpiphp_slot *slot)
 {
         struct acpiphp_func *func;
         struct pci_dev *pdev;
+        struct pci_bus *bus = slot->bridge->pci_bus;
 
-        /* is this slot already disabled? */
-        if (!(slot->flags & SLOT_ENABLED))
+        /* The slot will be enabled when func 0 is added, so check
+           func 0 before disable the slot. */
+        pdev = pci_get_slot(bus, PCI_DEVFN(slot->device, 0));
+        if (!pdev)
                 goto err_exit;
 
         list_for_each_entry(func, &slot->funcs, sibling) {
@@ -913,7 +910,7 @@ static int disable_device(struct acpiphp_slot *slot)
                                 disable_bridges(pdev->subordinate);
                                 pci_disable_device(pdev);
                         }
-                        pci_remove_bus_device(pdev);
+                        __pci_remove_bus_device(pdev);
                         pci_dev_put(pdev);
                 }
         }
@@ -1070,7 +1067,7 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus)
                                         res->end) {
                                 /* Could not assign a required resources
                                  * for this device, remove it */
-                                pci_remove_bus_device(dev);
+                                pci_stop_and_remove_bus_device(dev);
                                 break;
                         }
                 }
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
index 829c327cfb5e..ae853ccd0cd5 100644
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -341,7 +341,7 @@ int cpci_unconfigure_slot(struct slot* slot)
                 dev = pci_get_slot(slot->bus,
                                     PCI_DEVFN(PCI_SLOT(slot->devfn), i));
                 if (dev) {
-                        pci_remove_bus_device(dev);
+                        pci_stop_and_remove_bus_device(dev);
                         pci_dev_put(dev);
                 }
         }
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
index fb3f84661bdc..81af764c629b 100644
--- a/drivers/pci/hotplug/cpcihp_generic.c
+++ b/drivers/pci/hotplug/cpcihp_generic.c
@@ -62,7 +62,7 @@
 #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
 
 /* local variables */
-static int debug;
+static bool debug;
 static char *bridge;
 static u8 bridge_busnr;
 static u8 bridge_slot;
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index 6173b9a4544e..1c8494021a42 100644
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -127,7 +127,7 @@ int cpqhp_unconfigure_device(struct pci_func* func)
                 struct pci_dev* temp = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, j));
                 if (temp) {
                         pci_dev_put(temp);
-                        pci_remove_bus_device(temp);
+                        pci_stop_and_remove_bus_device(temp);
                 }
         }
         return 0;
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 17d10e2e8fb6..a019c9a712be 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -40,7 +40,7 @@ static ssize_t legacy_show(struct kobject *kobj, struct attribute *attr,
 
 static void remove_callback(void *data)
 {
-        pci_remove_bus_device((struct pci_dev *)data);
+        pci_stop_and_remove_bus_device((struct pci_dev *)data);
 }
 
 static ssize_t legacy_store(struct kobject *kobj, struct attribute *attr,
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 5506e0e8fbc0..4fda7e6a86a7 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -721,7 +721,7 @@ static void ibm_unconfigure_device(struct pci_func *func)
         for (j = 0; j < 0x08; j++) {
                 temp = pci_get_bus_and_slot(func->busno, (func->device << 3) | j);
                 if (temp) {
-                        pci_remove_bus_device(temp);
+                        pci_stop_and_remove_bus_device(temp);
                         pci_dev_put(temp);
                 }
         }
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 2850e64dedae..714ca5c4ed50 100644
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -368,8 +368,10 @@ int __init ibmphp_access_ebda (void)
                         debug ("rio blk id: %x\n", blk_id);
 
                         rio_table_ptr = kzalloc(sizeof(struct rio_table_hdr), GFP_KERNEL);
-                        if (!rio_table_ptr)
-                                return -ENOMEM; 
+                        if (!rio_table_ptr) {
+                                rc = -ENOMEM;
+                                goto out;
+                        }
                         rio_table_ptr->ver_num = readb (io_mem + offset);
                         rio_table_ptr->scal_count = readb (io_mem + offset + 1);
                         rio_table_ptr->riodev_count = readb (io_mem + offset + 2);
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index bcdbb1643621..a960faec1021 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -241,34 +241,79 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
         return retval;
 }
 
-static inline int check_link_active(struct controller *ctrl)
+static bool check_link_active(struct controller *ctrl)
 {
-        u16 link_status;
+        bool ret = false;
+        u16 lnk_status;
 
-        if (pciehp_readw(ctrl, PCI_EXP_LNKSTA, &link_status))
-                return 0;
-        return !!(link_status & PCI_EXP_LNKSTA_DLLLA);
+        if (pciehp_readw(ctrl, PCI_EXP_LNKSTA, &lnk_status))
+                return ret;
+
+        ret = !!(lnk_status & PCI_EXP_LNKSTA_DLLLA);
+
+        if (ret)
+                ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status);
+
+        return ret;
 }
 
-static void pcie_wait_link_active(struct controller *ctrl)
+static void __pcie_wait_link_active(struct controller *ctrl, bool active)
 {
         int timeout = 1000;
 
-        if (check_link_active(ctrl))
+        if (check_link_active(ctrl) == active)
                 return;
         while (timeout > 0) {
                 msleep(10);
                 timeout -= 10;
-                if (check_link_active(ctrl))
+                if (check_link_active(ctrl) == active)
                         return;
         }
-        ctrl_dbg(ctrl, "Data Link Layer Link Active not set in 1000 msec\n");
+        ctrl_dbg(ctrl, "Data Link Layer Link Active not %s in 1000 msec\n",
+                        active ? "set" : "cleared");
+}
+
+static void pcie_wait_link_active(struct controller *ctrl)
+{
+        __pcie_wait_link_active(ctrl, true);
+}
+
+static void pcie_wait_link_not_active(struct controller *ctrl)
+{
+        __pcie_wait_link_active(ctrl, false);
+}
+
+static bool pci_bus_check_dev(struct pci_bus *bus, int devfn)
+{
+        u32 l;
+        int count = 0;
+        int delay = 1000, step = 20;
+        bool found = false;
+
+        do {
+                found = pci_bus_read_dev_vendor_id(bus, devfn, &l, 0);
+                count++;
+
+                if (found)
+                        break;
+
+                msleep(step);
+                delay -= step;
+        } while (delay > 0);
+
+        if (count > 1 && pciehp_debug)
+                printk(KERN_DEBUG "pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n",
+                        pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
+                        PCI_FUNC(devfn), count, step, l);
+
+        return found;
 }
 
 int pciehp_check_link_status(struct controller *ctrl)
 {
         u16 lnk_status;
         int retval = 0;
+        bool found = false;
 
         /*
          * Data Link Layer Link Active Reporting must be capable for
@@ -280,13 +325,10 @@ int pciehp_check_link_status(struct controller *ctrl)
         else
                 msleep(1000);
 
-        /*
-         * Need to wait for 1000 ms after Data Link Layer Link Active
-         * (DLLLA) bit reads 1b before sending configuration request.
-         * We need it before checking Link Training (LT) bit becuase
-         * LT is still set even after DLLLA bit is set on some platform.
-         */
-        msleep(1000);
+        /* wait 100ms before read pci conf, and try in 1s */
+        msleep(100);
+        found = pci_bus_check_dev(ctrl->pcie->port->subordinate,
+                                        PCI_DEVFN(0, 0));
 
         retval = pciehp_readw(ctrl, PCI_EXP_LNKSTA, &lnk_status);
         if (retval) {
@@ -302,19 +344,50 @@ int pciehp_check_link_status(struct controller *ctrl)
                 return retval;
         }
 
-        /*
-         * If the port supports Link speeds greater than 5.0 GT/s, we
-         * must wait for 100 ms after Link training completes before
-         * sending configuration request.
-         */
-        if (ctrl->pcie->port->subordinate->max_bus_speed > PCIE_SPEED_5_0GT)
-                msleep(100);
-
         pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status);
 
+        if (!found && !retval)
+                retval = -1;
+
         return retval;
 }
 
+static int __pciehp_link_set(struct controller *ctrl, bool enable)
+{
+        u16 lnk_ctrl;
+        int retval = 0;
+
+        retval = pciehp_readw(ctrl, PCI_EXP_LNKCTL, &lnk_ctrl);
+        if (retval) {
+                ctrl_err(ctrl, "Cannot read LNKCTRL register\n");
+                return retval;
+        }
+
+        if (enable)
+                lnk_ctrl &= ~PCI_EXP_LNKCTL_LD;
+        else
+                lnk_ctrl |= PCI_EXP_LNKCTL_LD;
+
+        retval = pciehp_writew(ctrl, PCI_EXP_LNKCTL, lnk_ctrl);
+        if (retval) {
+                ctrl_err(ctrl, "Cannot write LNKCTRL register\n");
+                return retval;
+        }
+        ctrl_dbg(ctrl, "%s: lnk_ctrl = %x\n", __func__, lnk_ctrl);
+
+        return retval;
+}
+
+static int pciehp_link_enable(struct controller *ctrl)
+{
+        return __pciehp_link_set(ctrl, true);
+}
+
+static int pciehp_link_disable(struct controller *ctrl)
+{
+        return __pciehp_link_set(ctrl, false);
+}
+
 int pciehp_get_attention_status(struct slot *slot, u8 *status)
 {
         struct controller *ctrl = slot->ctrl;
@@ -533,6 +606,10 @@ int pciehp_power_on_slot(struct slot * slot)
         ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
                  pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_cmd);
 
+        retval = pciehp_link_enable(ctrl);
+        if (retval)
+                ctrl_err(ctrl, "%s: Can not enable the link!\n", __func__);
+
         return retval;
 }
 
@@ -543,6 +620,14 @@ int pciehp_power_off_slot(struct slot * slot)
         u16 cmd_mask;
         int retval;
 
+        /* Disable the link at first */
+        pciehp_link_disable(ctrl);
+        /* wait the link is down */
+        if (ctrl->link_active_reporting)
+                pcie_wait_link_not_active(ctrl);
+        else
+                msleep(1000);
+
         slot_cmd = POWER_OFF;
         cmd_mask = PCI_EXP_SLTCTL_PCC;
         retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index a4031dfe938e..47d9dc06b109 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -141,7 +141,7 @@ int pciehp_unconfigure_device(struct slot *p_slot)
                                 break;
                         }
                 }
-                pci_remove_bus_device(temp);
+                pci_stop_and_remove_bus_device(temp);
                 /*
                  * Ensure that no new Requests will be generated from
                  * the device.
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index c56a9413e1af..1e117c2a3cad 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -389,7 +389,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
         BUG_ON(!bus->self);
         pr_debug("PCI: Now removing bridge device %s\n", pci_name(bus->self));
         eeh_remove_bus_device(bus->self);
-        pci_remove_bus_device(bus->self);
+        pci_stop_and_remove_bus_device(bus->self);
 
         return 0;
 }
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 72d507b6a2aa..de573113c102 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -554,7 +554,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
                                              PCI_FUNC(func)));
                 if (dev) {
                         sn_bus_free_data(dev);
-                        pci_remove_bus_device(dev);
+                        pci_stop_and_remove_bus_device(dev);
                         pci_dev_put(dev);
                 }
         }
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index a2ccfcd3c298..df7e4bfadae3 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -124,7 +124,7 @@ int shpchp_unconfigure_device(struct slot *p_slot)
                                 break;
                         }
                 }
-                pci_remove_bus_device(temp);
+                pci_stop_and_remove_bus_device(temp);
                 pci_dev_put(temp);
         }
         return rc;