nfsd4: reshuffle lease-setting code to allow reuse
[safe/jmp/linux-2.6] / drivers / ieee1394 / hosts.c
index 2d47b11..e947d8f 100644 (file)
  * directory of the kernel sources for details.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <linux/timer.h>
 #include <linux/jiffies.h>
 #include <linux/mutex.h>
 #include "config_roms.h"
 
 
-static void delayed_reset_bus(void * __reset_info)
+static void delayed_reset_bus(struct work_struct *work)
 {
-       struct hpsb_host *host = (struct hpsb_host*)__reset_info;
-       int generation = host->csr.generation + 1;
+       struct hpsb_host *host =
+               container_of(work, struct hpsb_host, delayed_reset.work);
+       u8 generation = host->csr.generation + 1;
 
        /* The generation field rolls over to 2 rather than 0 per IEEE
         * 1394a-2000. */
        if (generation > 0xf || generation < 2)
                generation = 2;
 
-       CSR_SET_BUS_INFO_GENERATION(host->csr.rom, generation);
+       csr_set_bus_info_generation(host->csr.rom, generation);
        if (csr1212_generate_csr_image(host->csr.rom) != CSR1212_SUCCESS) {
-               /* CSR image creation failed, reset generation field and do not
-                * issue a bus reset. */
-               CSR_SET_BUS_INFO_GENERATION(host->csr.rom, host->csr.generation);
+               /* CSR image creation failed.
+                * Reset generation field and do not issue a bus reset. */
+               csr_set_bus_info_generation(host->csr.rom,
+                                           host->csr.generation);
                return;
        }
 
@@ -54,7 +54,8 @@ static void delayed_reset_bus(void * __reset_info)
 
        host->update_config_rom = 0;
        if (host->driver->set_hw_config_rom)
-               host->driver->set_hw_config_rom(host, host->csr.rom->bus_info_data);
+               host->driver->set_hw_config_rom(host,
+                                               host->csr.rom->bus_info_data);
 
        host->csr.gen_timestamp[host->csr.generation] = jiffies;
        hpsb_reset_bus(host, SHORT_RESET);
@@ -70,7 +71,8 @@ static int dummy_devctl(struct hpsb_host *h, enum devctl_cmd c, int arg)
        return -1;
 }
 
-static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command, unsigned long arg)
+static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command,
+                       unsigned long arg)
 {
        return -1;
 }
@@ -91,6 +93,8 @@ static int alloc_hostnum_cb(struct hpsb_host *host, void *__data)
        return 0;
 }
 
+static DEFINE_MUTEX(host_num_alloc);
+
 /**
  * hpsb_alloc_host - allocate a new host controller.
  * @drv: the driver that will manage the host controller
@@ -103,11 +107,9 @@ static int alloc_hostnum_cb(struct hpsb_host *host, void *__data)
  * driver specific parts, enable the controller and make it available
  * to the general subsystem using hpsb_add_host().
  *
- * Return Value: a pointer to the &hpsb_host if succesful, %NULL if
+ * Return Value: a pointer to the &hpsb_host if successful, %NULL if
  * no memory was available.
  */
-static DEFINE_MUTEX(host_num_alloc);
-
 struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
                                  struct device *dev)
 {
@@ -115,62 +117,63 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
        int i;
        int hostnum = 0;
 
-       h = kzalloc(sizeof(*h) + extra, SLAB_KERNEL);
+       h = kzalloc(sizeof(*h) + extra, GFP_KERNEL);
        if (!h)
                return NULL;
 
        h->csr.rom = csr1212_create_csr(&csr_bus_ops, CSR_BUS_INFO_SIZE, h);
-       if (!h->csr.rom) {
-               kfree(h);
-               return NULL;
-       }
+       if (!h->csr.rom)
+               goto fail;
 
        h->hostdata = h + 1;
        h->driver = drv;
 
-       skb_queue_head_init(&h->pending_packet_queue);
+       INIT_LIST_HEAD(&h->pending_packets);
        INIT_LIST_HEAD(&h->addr_space);
 
        for (i = 2; i < 16; i++)
                h->csr.gen_timestamp[i] = jiffies - 60 * HZ;
 
-       for (i = 0; i < ARRAY_SIZE(h->tpool); i++)
-               HPSB_TPOOL_INIT(&h->tpool[i]);
-
        atomic_set(&h->generation, 0);
 
-       INIT_WORK(&h->delayed_reset, delayed_reset_bus, h);
+       INIT_DELAYED_WORK(&h->delayed_reset, delayed_reset_bus);
        
        init_timer(&h->timeout);
        h->timeout.data = (unsigned long) h;
        h->timeout.function = abort_timedouts;
-       h->timeout_interval = HZ / 20; // 50ms by default
+       h->timeout_interval = HZ / 20; /* 50ms, half of minimum SPLIT_TIMEOUT */
 
        h->topology_map = h->csr.topology_map + 3;
        h->speed_map = (u8 *)(h->csr.speed_map + 2);
 
        mutex_lock(&host_num_alloc);
-
        while (nodemgr_for_each_host(&hostnum, alloc_hostnum_cb))
                hostnum++;
-
+       mutex_unlock(&host_num_alloc);
        h->id = hostnum;
 
        memcpy(&h->device, &nodemgr_dev_template_host, sizeof(h->device));
        h->device.parent = dev;
-       snprintf(h->device.bus_id, BUS_ID_SIZE, "fw-host%d", h->id);
-
-       h->class_dev.dev = &h->device;
-       h->class_dev.class = &hpsb_host_class;
-       snprintf(h->class_dev.class_id, BUS_ID_SIZE, "fw-host%d", h->id);
-
-       device_register(&h->device);
-       class_device_register(&h->class_dev);
+       set_dev_node(&h->device, dev_to_node(dev));
+       dev_set_name(&h->device, "fw-host%d", h->id);
+
+       h->host_dev.parent = &h->device;
+       h->host_dev.class = &hpsb_host_class;
+       dev_set_name(&h->host_dev, "fw-host%d", h->id);
+
+       if (device_register(&h->device))
+               goto fail;
+       if (device_register(&h->host_dev)) {
+               device_unregister(&h->device);
+               goto fail;
+       }
        get_device(&h->device);
 
-       mutex_unlock(&host_num_alloc);
-
        return h;
+
+fail:
+       kfree(h);
+       return NULL;
 }
 
 int hpsb_add_host(struct hpsb_host *host)
@@ -178,13 +181,18 @@ int hpsb_add_host(struct hpsb_host *host)
        if (hpsb_default_host_entry(host))
                return -ENOMEM;
 
-       hpsb_add_extra_config_roms(host);
-
        highlevel_add_host(host);
-
        return 0;
 }
 
+void hpsb_resume_host(struct hpsb_host *host)
+{
+       if (host->driver->set_hw_config_rom)
+               host->driver->set_hw_config_rom(host,
+                                               host->csr.rom->bus_info_data);
+       host->driver->devctl(host, RESET_BUS, SHORT_RESET);
+}
+
 void hpsb_remove_host(struct hpsb_host *host)
 {
        host->is_shutdown = 1;
@@ -193,15 +201,20 @@ void hpsb_remove_host(struct hpsb_host *host)
        flush_scheduled_work();
 
        host->driver = &dummy_driver;
-
        highlevel_remove_host(host);
 
-       hpsb_remove_extra_config_roms(host);
-
-       class_device_unregister(&host->class_dev);
+       device_unregister(&host->host_dev);
        device_unregister(&host->device);
 }
 
+/**
+ * hpsb_update_config_rom_image - updates configuration ROM image of a host
+ *
+ * Updates the configuration ROM image of a host.  rom_version must be the
+ * current version, otherwise it will fail with return value -1. If this
+ * host does not support config-rom-update, it will return -%EINVAL.
+ * Return value 0 indicates success.
+ */
 int hpsb_update_config_rom_image(struct hpsb_host *host)
 {
        unsigned long reset_delay;
@@ -222,13 +235,14 @@ int hpsb_update_config_rom_image(struct hpsb_host *host)
        if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 * HZ))
                /* Wait 60 seconds from the last time this generation number was
                 * used. */
-               reset_delay = (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies;
+               reset_delay =
+                       (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies;
        else
                /* Wait 1 second in case some other code wants to change the
                 * Config ROM in the near future. */
                reset_delay = HZ;
 
-       PREPARE_WORK(&host->delayed_reset, delayed_reset_bus, host);
+       PREPARE_DELAYED_WORK(&host->delayed_reset, delayed_reset_bus);
        schedule_delayed_work(&host->delayed_reset, reset_delay);
 
        return 0;