[PATCH] dm snapshot: fix metadata writing when suspending

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / pciehp_core.c

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 8df7048603480427e8cff83517d76647cc715627..c67b7c3f1ddf3e485df6b5c820c6338214b5c670 100644 (file)
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -69,6 +69,7 @@ static int get_power_status   (struct hotplug_slot *slot, u8 *value);
 static int get_attention_status        (struct hotplug_slot *slot, u8 *value);
 static int get_latch_status    (struct hotplug_slot *slot, u8 *value);
 static int get_adapter_status  (struct hotplug_slot *slot, u8 *value);
+static int get_address         (struct hotplug_slot *slot, u32 *value);
 static int get_max_bus_speed   (struct hotplug_slot *slot, enum pci_bus_speed *value);
 static int get_cur_bus_speed   (struct hotplug_slot *slot, enum pci_bus_speed *value);
 
@@ -81,6 +82,7 @@ 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,
 };
@@ -103,7 +105,10 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
 
 static int init_slots(struct controller *ctrl)
 {
-       struct slot *new_slot;
+       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;
@@ -114,59 +119,62 @@ static int init_slots(struct controller *ctrl)
        slot_number = ctrl->first_slot;
 
        while (number_of_slots) {
-               new_slot = kmalloc(sizeof(*new_slot), GFP_KERNEL);
-               if (!new_slot)
+               slot = kzalloc(sizeof(*slot), GFP_KERNEL);
+               if (!slot)
                        goto error;
 
-               memset(new_slot, 0, sizeof(struct slot));
-               new_slot->hotplug_slot =
-                               kmalloc(sizeof(*(new_slot->hotplug_slot)),
+               slot->hotplug_slot =
+                               kzalloc(sizeof(*(slot->hotplug_slot)),
                                                GFP_KERNEL);
-               if (!new_slot->hotplug_slot)
+               if (!slot->hotplug_slot)
                        goto error_slot;
-               memset(new_slot->hotplug_slot, 0, sizeof(struct hotplug_slot));
+               hotplug_slot = slot->hotplug_slot;
 
-               new_slot->hotplug_slot->info =
-                       kmalloc(sizeof(*(new_slot->hotplug_slot->info)),
+               hotplug_slot->info =
+                       kzalloc(sizeof(*(hotplug_slot->info)),
                                                GFP_KERNEL);
-               if (!new_slot->hotplug_slot->info)
+               if (!hotplug_slot->info)
                        goto error_hpslot;
-               memset(new_slot->hotplug_slot->info, 0,
-                                       sizeof(struct hotplug_slot_info));
-               new_slot->hotplug_slot->name = kmalloc(SLOT_NAME_SIZE,
-                                               GFP_KERNEL);
-               if (!new_slot->hotplug_slot->name)
+               hotplug_slot_info = hotplug_slot->info;
+               hotplug_slot->name = kmalloc(SLOT_NAME_SIZE, GFP_KERNEL);
+               if (!hotplug_slot->name)
                        goto error_info;
 
-               new_slot->ctrl = ctrl;
-               new_slot->bus = ctrl->slot_bus;
-               new_slot->device = slot_device;
-               new_slot->hpc_ops = ctrl->hpc_ops;
+               slot->ctrl = ctrl;
+               slot->bus = ctrl->slot_bus;
+               slot->device = slot_device;
+               slot->hpc_ops = hpc_ops = ctrl->hpc_ops;
 
-               new_slot->number = ctrl->first_slot;
-               new_slot->hp_slot = slot_device - ctrl->slot_device_offset;
+               slot->number = ctrl->first_slot;
+               slot->hp_slot = slot_device - ctrl->slot_device_offset;
 
                /* register this slot with the hotplug pci core */
-               new_slot->hotplug_slot->private = new_slot;
-               new_slot->hotplug_slot->release = &release_slot;
-               make_slot_name(new_slot->hotplug_slot->name, SLOT_NAME_SIZE, new_slot);
-               new_slot->hotplug_slot->ops = &pciehp_hotplug_slot_ops;
-
-               new_slot->hpc_ops->get_power_status(new_slot, &(new_slot->hotplug_slot->info->power_status));
-               new_slot->hpc_ops->get_attention_status(new_slot, &(new_slot->hotplug_slot->info->attention_status));
-               new_slot->hpc_ops->get_latch_status(new_slot, &(new_slot->hotplug_slot->info->latch_status));
-               new_slot->hpc_ops->get_adapter_status(new_slot, &(new_slot->hotplug_slot->info->adapter_status));
-
-               dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x slot_device_offset=%x\n", 
-                       new_slot->bus, new_slot->device, new_slot->hp_slot, new_slot->number, ctrl->slot_device_offset);
-               result = pci_hp_register (new_slot->hotplug_slot);
+               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;
                }
 
-               new_slot->next = ctrl->slot;
-               ctrl->slot = new_slot;
+               slot->next = ctrl->slot;
+               ctrl->slot = slot;
 
                number_of_slots--;
                slot_device++;
@@ -176,13 +184,13 @@ static int init_slots(struct controller *ctrl)
        return 0;
 
 error_name:
-       kfree(new_slot->hotplug_slot->name);
+       kfree(hotplug_slot->name);
 error_info:
-       kfree(new_slot->hotplug_slot->info);
+       kfree(hotplug_slot_info);
 error_hpslot:
-       kfree(new_slot->hotplug_slot);
+       kfree(hotplug_slot);
 error_slot:
-       kfree(new_slot);
+       kfree(slot);
 error:
        return result;
 }
@@ -325,6 +333,18 @@ 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)
 {
        struct slot *slot = hotplug_slot->private;
@@ -363,12 +383,11 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
        u8 value;
        struct pci_dev *pdev;
        
-       ctrl = kmalloc(sizeof(*ctrl), GFP_KERNEL);
+       ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
        if (!ctrl) {
                err("%s : out of memory\n", __FUNCTION__);
                goto err_out_none;
        }
-       memset(ctrl, 0, sizeof(struct controller));
 
        pdev = dev->port;
        ctrl->pci_dev = pdev;
@@ -429,7 +448,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
        }
 
        /* Wait for exclusive access to hardware */
-       down(&ctrl->crit_sect);
+       mutex_lock(&ctrl->crit_sect);
 
        t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
        
@@ -437,7 +456,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
                rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
                if (rc) {
                        /* Done with exclusive hardware access */
-                       up(&ctrl->crit_sect);
+                       mutex_unlock(&ctrl->crit_sect);
                        goto err_out_free_ctrl_slot;
                } else
                        /* Wait for the command to complete */
@@ -445,7 +464,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
        }
 
        /* Done with exclusive hardware access */
-       up(&ctrl->crit_sect);
+       mutex_unlock(&ctrl->crit_sect);
 
        return 0;
 
@@ -502,7 +521,7 @@ static void __exit unload_pciehpd(void)
 
 }
 
-int hpdriver_context = 0;
+static int hpdriver_context = 0;
 
 static void pciehp_remove (struct pcie_device *device)
 {